From 7aae6746b1360e62397b45666451ed776baa197a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 15 Sep 2016 13:12:22 -0700
Subject: [PATCH] Prevent height change in default ringtone preferences.

- Added a placeholder summary text in ringtone preferences so the height
  is reserved while we load ringtone names.

Bug: 28075406
Test: Visually inspected
Change-Id: Ia4022679fcc9d6992c3bb9439f7bfce9bb552ea1
---
 res/values/strings.xml     | 2 +-
 res/xml/sound_settings.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf064a53312..524cd2baecc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2033,7 +2033,7 @@
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound</string>
     <!-- Sound settings screen, setting option summary text -->
-    <string name="ringtone_summary">""</string>
+    <string name="ringtone_summary">&#160;</string>
     <!-- Sound settings screen, volume title -->
     <string name="all_volume_title">Volumes</string>
     <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 5e978f63d92..227a650feb1 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -63,6 +63,7 @@
                 android:key="ringtone"
                 android:title="@string/ringtone_title"
                 android:dialogTitle="@string/ringtone_title"
+                android:summary="@string/ringtone_summary"
                 android:ringtoneType="ringtone" />
 
         <!-- Default notification ringtone -->
@@ -70,6 +71,7 @@
                 android:key="notification_ringtone"
                 android:title="@string/notification_ringtone_title"
                 android:dialogTitle="@string/notification_ringtone_title"
+                android:summary="@string/ringtone_summary"
                 android:ringtoneType="notification" />
 
         <!-- Default alarm ringtone -->
@@ -77,6 +79,7 @@
                 android:key="alarm_ringtone"
                 android:title="@string/alarm_ringtone_title"
                 android:dialogTitle="@string/alarm_ringtone_title"
+                android:summary="@string/ringtone_summary"
                 android:persistent="false"
                 android:ringtoneType="alarm" />