From cec61d4cd1730130930744213bcabf61ddbce13e Mon Sep 17 00:00:00 2001
From: Eric Sandness <sandness@google.com>
Date: Fri, 2 Mar 2018 13:02:02 +0000
Subject: [PATCH] Fix Ordering Of Work Notifications Settings

The work notification settings were previously moved to the bottom of
the notification settings screen, but subsequent changes have caused
them to appear near the top again.  Move them back to the bottom.

Fixes: 64436619
Test: Open Settings app manually with and without a work profile
Change-Id: I90a03eb5c018a7684329e395da027a2f736516eb
---
 res/xml/configure_notification_settings.xml | 25 ++++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 9d724416785..5447c9c0d94 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -25,17 +25,6 @@
         android:title="@string/lock_screen_notifications_title"
         android:summary="@string/summary_placeholder"/>
 
-    <PreferenceCategory
-        android:key="lock_screen_notifications_profile_header"
-        android:title="@string/profile_section_header">
-
-        <com.android.settings.RestrictedListPreference
-            android:key="lock_screen_notifications_profile"
-            android:title="@string/lock_screen_notifications_title"
-            android:summary="@string/summary_placeholder"/>
-
-    </PreferenceCategory>
-
     <!-- Notification badging -->
     <SwitchPreference
         android:key="notification_badging"
@@ -84,5 +73,19 @@
         </Preference>
     </PreferenceCategory>
 
+    <!-- Place work profile section at the bottom to avoid users thinking that any of the
+         above settings are specific to the work profile -->
+    <PreferenceCategory
+        android:key="lock_screen_notifications_profile_header"
+        android:title="@string/profile_section_header"
+        android:order="23">
+
+        <com.android.settings.RestrictedListPreference
+            android:key="lock_screen_notifications_profile"
+            android:title="@string/lock_screen_notifications_title"
+            android:summary="@string/summary_placeholder"
+            android:order="24"/>
+
+    </PreferenceCategory>
 
 </PreferenceScreen>