From 2e72dda1aafa76c9f2d06b79e77a67849db4aea1 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 28 Jun 2017 18:14:18 -0700
Subject: [PATCH] Add ordering attribute to sound setting preferences.

The ordering helps injected settings show up before work profile
settings.

Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
---
 res/xml/sound_settings.xml                    | 53 +++++++++++--------
 .../notification/SettingPrefController.java   |  1 +
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d288a9dec37..f5705bb8356 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -14,12 +14,15 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-          android:title="@string/sound_settings"
-          android:key="sound_settings"
-          settings:keywords="@string/keywords_sounds">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/sound_settings"
+    android:key="sound_settings"
+    settings:keywords="@string/keywords_sounds">
 
+    <PreferenceCategory
+        android:order="-100">
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
@@ -49,7 +52,6 @@
                 android:key="vibrate_when_ringing"
                 android:title="@string/vibrate_when_ringing_title" />
 
-
         <!-- Interruptions -->
         <com.android.settingslib.RestrictedPreference
                 android:key="zen_mode"
@@ -84,11 +86,13 @@
             android:summary="@string/summary_placeholder"
             android:persistent="false"
             android:ringtoneType="alarm" />
+    </PreferenceCategory>
 
-        <!-- Other sounds -->
-        <PreferenceCategory
+    <!-- Other sounds -->
+    <PreferenceCategory
           android:key="other_sound_preferecence_category"
-          android:title="@string/other_sound_category_preference_title" />
+          android:title="@string/other_sound_category_preference_title"
+          android:order="-50">
 
         <!-- Dial pad tones -->
         <SwitchPreference
@@ -136,21 +140,24 @@
           android:key="emergency_tone"
           android:title="@string/emergency_tone_title"
           android:summary="%s" />
+    </PreferenceCategory>
 
-        <com.android.settingslib.RestrictedPreference
-          android:key="cell_broadcast_settings"
-          android:title="@string/cell_broadcast_settings"
-          settings:useAdminDisabledSummary="true"
-          settings:allowDividerAbove="true" >
-                <intent
-                  android:action="android.intent.action.MAIN"
-                  android:targetPackage="com.android.cellbroadcastreceiver"
-                  android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
-        </com.android.settingslib.RestrictedPreference>
+    <com.android.settingslib.RestrictedPreference
+      android:key="cell_broadcast_settings"
+      android:title="@string/cell_broadcast_settings"
+      settings:useAdminDisabledSummary="true"
+      settings:allowDividerAbove="true"
+      android:order="-1">
+            <intent
+              android:action="android.intent.action.MAIN"
+              android:targetPackage="com.android.cellbroadcastreceiver"
+              android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+    </com.android.settingslib.RestrictedPreference>
 
-        <com.android.settings.WorkOnlyCategory
-            android:key="sound_work_settings_section"
-            android:title="@string/sound_work_settings">
+    <com.android.settings.WorkOnlyCategory
+        android:key="sound_work_settings_section"
+        android:title="@string/sound_work_settings"
+        android:order="100">
 
                 <!-- Use the same sounds of the work profile -->
                 <SwitchPreference
@@ -184,5 +191,5 @@
                     android:ringtoneType="alarm"
                     android:dependency="work_use_personal_sounds" />
 
-        </com.android.settings.WorkOnlyCategory>
+    </com.android.settings.WorkOnlyCategory>
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index 2af1bde3ca3..ac613d18062 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -55,6 +55,7 @@ public abstract class SettingPrefController extends AbstractPreferenceController
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mPreference.init(mParent);
+        super.displayPreference(screen);
         if (isAvailable()) {
             mSettingsObserver = new SettingsObserver();
         }