From 827b654890a5b005c99725ccd89a19c446b7349b Mon Sep 17 00:00:00 2001
From: Peter E Conn <peconn@chromium.org>
Date: Thu, 7 Sep 2017 09:05:14 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=A1=20Remove=20divider=20from=20Notifi?=
 =?UTF-8?q?cations=20Preferences=20page.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TBR=peconn@chromium.org

(cherry picked from commit e8e90c2824dc6946559191d0d2089be41a0ea5f5)

Bug: 762033
Change-Id: I1f9bb01d495ff7b437fbc1e44c53172dffe997a4
Reviewed-on: https://chromium-review.googlesource.com/649531
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499639}
Reviewed-on: https://chromium-review.googlesource.com/654661
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#62}
Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098}
---
 chrome/android/java/res/xml/notifications_preferences.xml   | 6 ++----
 .../browser/preferences/NotificationsPreferences.java       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/chrome/android/java/res/xml/notifications_preferences.xml b/chrome/android/java/res/xml/notifications_preferences.xml
index 2f7c10343ba6..56a6565d2f5b 100644
--- a/chrome/android/java/res/xml/notifications_preferences.xml
+++ b/chrome/android/java/res/xml/notifications_preferences.xml
@@ -3,14 +3,12 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:chrome="http://schemas.android.com/apk/res-auto" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
         android:key="content_suggestions"
         android:title="@string/notifications_content_suggestions_title"
-        android:summary="@string/notifications_content_suggestions_summary"
-        chrome:drawDivider="true" />
+        android:summary="@string/notifications_content_suggestions_summary" />
 
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java
index b50945d72109..188a1552d6c7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java
@@ -39,7 +39,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         mSnippetsBridge = new SnippetsBridge(Profile.getLastUsedProfile());
 
-        addPreferencesFromResource(R.xml.notifications_preferences);
+        PreferenceUtils.addPreferencesFromResource(this, R.xml.notifications_preferences);
         getActivity().setTitle(R.string.prefs_notifications);
 
         mSuggestionsPref = (ChromeSwitchPreference) findPreference(PREF_SUGGESTIONS);