diff options
author | Daisuke Miyakawa <dmiyakawa@google.com> | 2012-05-11 17:54:42 -0700 |
---|---|---|
committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2012-05-14 15:08:19 -0700 |
commit | 16d91c19dcabea63f38757ab5cafb56c29ad22e8 (patch) | |
tree | 3fa4f08c6945ad68c273087f65ad95bd9e655d58 /res | |
parent | 97bbb5332414be257678476cf037e396c0b88c17 (diff) | |
download | packages_apps_settings-16d91c19dcabea63f38757ab5cafb56c29ad22e8.zip packages_apps_settings-16d91c19dcabea63f38757ab5cafb56c29ad22e8.tar.gz packages_apps_settings-16d91c19dcabea63f38757ab5cafb56c29ad22e8.tar.bz2 |
Modify menu layout for sound setting
- Move notification setting to "System" section
- Modify strings for category titles
- Change strings' names too to reflect their contents
-- sound_category_calls_and_notification_title
-> sound_category_call_ringtone_vibrate_title
-- soud_category_feedback_title
-> sound_category_system_title
Bug: 6036529
Change-Id: I7aaa83571ae3d69212e9debaec4f3b4ec60a281c
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 10 | ||||
-rw-r--r-- | res/xml/sound_settings.xml | 18 |
2 files changed, 17 insertions, 11 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index dc4fe67..948a69e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3352,9 +3352,15 @@ <string name="untitled_apn">Untitled</string> <string name="sound_category_sound_title">General</string> - <string name="sound_category_calls_and_notification_title">Ringtone & notifications</string> <string name="sound_category_notification_title">Notifications</string> - <string name="sound_category_feedback_title">System</string> + + <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting. + [CHAR LIMIT=40] --> + <string name="sound_category_call_ringtone_vibrate_title">Call ringtone & vibrate</string> + + <!-- Category title for system-wide notification and feedback settings in the Sound Setting. + [CHAR LIMIT=40] --> + <string name="sound_category_system_title">System</string> <!-- Wifi Setup For Setup Wizard with XL screen --> <!-- Title shown in Wifi Setup Wizard with XL screen --> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index e9c9a61..a1252a1 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -41,7 +41,7 @@ <PreferenceCategory android:key="category_calls_and_notification" - android:title="@string/sound_category_calls_and_notification_title"/> + android:title="@string/sound_category_call_ringtone_vibrate_title"/> <!-- Do not nest these, or removals in code will break --> <com.android.settings.DefaultRingtonePreference @@ -51,23 +51,23 @@ android:persistent="false" android:ringtoneType="ringtone" /> - <com.android.settings.DefaultRingtonePreference - android:key="notification_sound" - android:title="@string/notification_sound_title" - android:dialogTitle="@string/notification_sound_dialog_title" - android:persistent="false" - android:ringtoneType="notification" /> - <CheckBoxPreference android:key="vibrate_when_ringing" android:title="@string/vibrate_when_ringing_title" android:persistent="false" /> <PreferenceCategory - android:title="@string/sound_category_feedback_title"/> + android:title="@string/sound_category_system_title"/> <!-- Do not nest these, or removals in code will break --> + <com.android.settings.DefaultRingtonePreference + android:key="notification_sound" + android:title="@string/notification_sound_title" + android:dialogTitle="@string/notification_sound_dialog_title" + android:persistent="false" + android:ringtoneType="notification" /> + <CheckBoxPreference android:key="dtmf_tone" android:title="@string/dtmf_tone_enable_title" |