Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19340d21 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

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

parents 4c3b2f0c 8ad849ca

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -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 -->

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

res/xml/sound_settings.xml

+24 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
        android:key="sound_settings"

        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">



    <PreferenceCategory

            android:title="@string/sound_category_sound_title"

            >



        <CheckBoxPreference

                android:key="silent"

                android:title="@string/silent_mode_title"
@@ -44,6 +48,12 @@ 
                android:order="3"

                android:streamType="ring" />



    </PreferenceCategory>



    <PreferenceCategory

            android:title="@string/sound_category_calls_title"

            >



        <com.android.settings.DefaultRingtonePreference

                android:key="ringtone"

                android:title="@string/ringtone_title"
@@ -61,6 +71,12 @@ 
                android:entries="@array/vibrate_entries"

                android:entryValues="@array/vibrate_values" />



    </PreferenceCategory>



    <PreferenceCategory

            android:title="@string/sound_category_notification_title"

            >



        <com.android.settings.DefaultRingtonePreference

                android:key="notification_sound"

                android:title="@string/notification_sound_title"
@@ -77,6 +93,12 @@ 
                android:order="8"

                android:persistent="false" />



    </PreferenceCategory>



    <PreferenceCategory

            android:title="@string/sound_category_feedback_title"

            >



        <CheckBoxPreference

                android:key="dtmf_tone"

                android:title="@string/dtmf_tone_enable_title"
@@ -116,4 +138,6 @@ 
                android:entries="@array/emergency_tone_entries"

                android:entryValues="@array/emergency_tone_values" />



    </PreferenceCategory>



</PreferenceScreen>