Commit 05659419 authored by Daniel Park's avatar Daniel Park Committed by Commit Bot

[Modern] Removes all div lines on a few settings pages

Removes divs from Clear Browsing Data, Accessibility,
   Site Settings, and Site Settings sub pages

Bug: 834600
Change-Id: I28afdc9e4a3823b082dc22da6c44653eabfcdb84
Reviewed-on: https://chromium-review.googlesource.com/1044273
Commit-Queue: Daniel Park <danielpark@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556153}
parent c482ee98
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="0dp"/> android:layout_height="0dp"/>
<View style="@style/Divider"/>
<Button <Button
android:id="@+id/clear_button" android:id="@+id/clear_button"
android:layout_gravity="end" android:layout_gravity="end"
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2017 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingBottom="8dp">
<View style="@style/Divider"/>
</LinearLayout>
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
android:title="@string/clear_browsing_data_tab_period_title" android:title="@string/clear_browsing_data_tab_period_title"
chrome:singleLine="true" /> chrome:singleLine="true" />
<Preference
android:layout="@layout/divider_preference_with_bottom_padding"
android:selectable="false"/>
<org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
android:key="clear_history_checkbox" android:key="clear_history_checkbox"
android:persistent="false" android:persistent="false"
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
for that category on/off.--> for that category on/off.-->
<org.chromium.chrome.browser.preferences.ChromeSwitchPreference <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
android:key="read_write_toggle" android:key="read_write_toggle"
android:defaultValue="true" android:defaultValue="true" />
chrome:drawDivider="true" />
<!-- A toggle for allowing third-party cookies, only shown for the Cookies category. --> <!-- A toggle for allowing third-party cookies, only shown for the Cookies category. -->
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="third_party_cookies" android:key="third_party_cookies"
......
...@@ -79,6 +79,7 @@ public class AccessibilityPreferences extends PreferenceFragment ...@@ -79,6 +79,7 @@ public class AccessibilityPreferences extends PreferenceFragment
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
((ListView) getView().findViewById(android.R.id.list)).setItemsCanFocus(true); ((ListView) getView().findViewById(android.R.id.list)).setItemsCanFocus(true);
((ListView) getView().findViewById(android.R.id.list)).setDivider(null);
} }
@Override @Override
......
...@@ -9,6 +9,7 @@ import android.os.Bundle; ...@@ -9,6 +9,7 @@ import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.widget.ListView;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.ChromeFeatureList;
...@@ -114,6 +115,12 @@ public class SiteSettingsPreferences extends PreferenceFragment ...@@ -114,6 +115,12 @@ public class SiteSettingsPreferences extends PreferenceFragment
return -1; return -1;
} }
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
((ListView) getView().findViewById(android.R.id.list)).setDivider(null);
}
private void configurePreferences() { private void configurePreferences() {
if (mMediaSubMenu) { if (mMediaSubMenu) {
// The Media sub-menu only contains Protected Content and Autoplay, so remove all other // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment