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

Commit 16d91c19 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

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
parent 97bbb533

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -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 -->

res/xml/sound_settings.xml

+9 −9
Original line number Diff line number Diff line
@@ -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"