Merge "Prevent height change in default ringtone preferences."

This commit is contained in:
TreeHugger Robot
2016-09-15 22:10:43 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -2040,7 +2040,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]-->

View File

@@ -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" />