commit 15d06244d317430580bbea25e1ddf51dbbb5cbd1
author Doris Ling <dling@google.com> Sun Oct 15 02:43:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 15 02:43:43 2017 +0000
tree a1081571a21b075d94d3920a04d30d37fbacea14
parent 91aeed6f55f2b490d4f6259b427f535a0c2905c8
parent 893bdba206d23e453019b66ee465350621382308

Update tile limit for Sound settings.
am: 893bdba206

Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24

res/xml/sound_settings.xml

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index b0aff02..a764d7a 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -70,24 +70,27 @@
             android:ringtoneType="ringtone"
             settings:allowDividerAbove="true" />
 
-        <!-- Default notification ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="notification_ringtone"
-            android:title="@string/notification_ringtone_title"
-            android:dialogTitle="@string/notification_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:ringtoneType="notification" />
-
-        <!-- Default alarm ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="alarm_ringtone"
-            android:title="@string/alarm_ringtone_title"
-            android:dialogTitle="@string/alarm_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:persistent="false"
-            android:ringtoneType="alarm" />
     </PreferenceCategory>
 
+    <!-- Default notification ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="notification_ringtone"
+        android:title="@string/notification_ringtone_title"
+        android:dialogTitle="@string/notification_ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:ringtoneType="notification"
+        android:order="-99"/>
+
+    <!-- Default alarm ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="alarm_ringtone"
+        android:title="@string/alarm_ringtone_title"
+        android:dialogTitle="@string/alarm_ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:persistent="false"
+        android:ringtoneType="alarm"
+        android:order="-98"/>
+
     <!-- Other sounds -->
     <PreferenceCategory
           android:title="@string/other_sound_category_preference_title"

src/com/android/settings/notification/SoundSettings.java

diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index e759c39..ad6da10 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -57,7 +57,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(6);
+        mProgressiveDisclosureMixin.setTileLimit(1);
     }
 
     @Override