From d58d342967439c5ff9ad749145b27964b47ba51a Mon Sep 17 00:00:00 2001
From: Alison Cichowlas <asc@google.com>
Date: Thu, 15 Jun 2017 11:06:28 -0400
Subject: [PATCH] Add separator line in notification settings, above link to
 in-app settings.

Test: make RunSettingsRoboTests
Bug: 62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
---
 res/xml/inapp_notification_settings.xml       | 26 +++++++++++++++++++
 .../NotificationSettingsBase.java             |  7 ++---
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 res/xml/inapp_notification_settings.xml

diff --git a/res/xml/inapp_notification_settings.xml b/res/xml/inapp_notification_settings.xml
new file mode 100644
index 00000000000..7547f3c1444
--- /dev/null
+++ b/res/xml/inapp_notification_settings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        android:key="app_link"
+        android:title="@string/app_settings_link"
+        android:order="500"
+        settings:allowDividerAbove="true"/>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 48ca207e339..78b763cee57 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -264,12 +264,9 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
 
     protected void addAppLinkPref() {
         if (mAppRow.settingsIntent != null && mAppLink == null) {
-            mAppLink = new Preference(getPrefContext());
-            mAppLink.setKey(KEY_APP_LINK);
-            mAppLink.setOrder(500);
+            addPreferencesFromResource(R.xml.inapp_notification_settings);
+            mAppLink = (Preference) findPreference(KEY_APP_LINK);
             mAppLink.setIntent(mAppRow.settingsIntent);
-            mAppLink.setTitle(mContext.getString(R.string.app_settings_link));
-            getPreferenceScreen().addPreference(mAppLink);
         }
     }