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
This commit is contained in:
Daisuke Miyakawa
2012-05-11 17:54:42 -07:00
parent 97bbb53324
commit 16d91c19dc
2 changed files with 17 additions and 11 deletions

View File

@@ -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 &amp; 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 &amp; 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 -->

View File

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