PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Labeled categories to help clarify Sound prefs." into froyo

Browse Source
This commit is contained in:
Daniel Sandler
2010-04-21 17:36:48 -07:00
committed by Android (Google) Code Review
parent 4c3b2f0cf0 8ad849ca26
commit 19340d213c
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -2521,4 +2521,9 @@ found in the list of installed applications.</string>
<!-- Name to assign to a Network Access Point that was saved without a name --> <!-- Name to assign to a Network Access Point that was saved without a name -->
<string name="untitled_apn">Untitled</string> <string name="untitled_apn">Untitled</string>
<string name="sound_category_sound_title">General</string>
<string name="sound_category_calls_title">Incoming calls</string>
<string name="sound_category_notification_title">Notifications</string>
<string name="sound_category_feedback_title">Feedback</string>
</resources> </resources>

24
res/xml/sound_settings.xml
View File

@@ -19,6 +19,10 @@
android:key="sound_settings" android:key="sound_settings"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<PreferenceCategory
android:title="@string/sound_category_sound_title"
>
<CheckBoxPreference <CheckBoxPreference
android:key="silent" android:key="silent"
android:title="@string/silent_mode_title" android:title="@string/silent_mode_title"
@@ -44,6 +48,12 @@
android:order="3" android:order="3"
android:streamType="ring" /> android:streamType="ring" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/sound_category_calls_title"
>
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
android:key="ringtone" android:key="ringtone"
android:title="@string/ringtone_title" android:title="@string/ringtone_title"
@@ -61,6 +71,12 @@
android:entries="@array/vibrate_entries" android:entries="@array/vibrate_entries"
android:entryValues="@array/vibrate_values" /> android:entryValues="@array/vibrate_values" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/sound_category_notification_title"
>
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
android:key="notification_sound" android:key="notification_sound"
android:title="@string/notification_sound_title" android:title="@string/notification_sound_title"
@@ -77,6 +93,12 @@
android:order="8" android:order="8"
android:persistent="false" /> android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/sound_category_feedback_title"
>
<CheckBoxPreference <CheckBoxPreference
android:key="dtmf_tone" android:key="dtmf_tone"
android:title="@string/dtmf_tone_enable_title" android:title="@string/dtmf_tone_enable_title"
@@ -116,4 +138,6 @@
android:entries="@array/emergency_tone_entries" android:entries="@array/emergency_tone_entries"
android:entryValues="@array/emergency_tone_values" /> android:entryValues="@array/emergency_tone_values" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>