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

Commit 2e72dda1 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add ordering attribute to sound setting preferences. 

The ordering helps injected settings show up before work profile
settings.

Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
parent db62b521

res/xml/sound_settings.xml

+33 −26
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

<PreferenceScreen

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

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

    android:title="@string/sound_settings"

    android:key="sound_settings"

    settings:keywords="@string/keywords_sounds">



    <PreferenceCategory

        android:order="-100">

        <!-- Media volume -->

        <com.android.settings.notification.VolumeSeekBarPreference

                android:key="media_volume"
@@ -49,7 +52,6 @@ 
                android:key="vibrate_when_ringing"

                android:title="@string/vibrate_when_ringing_title" />





        <!-- Interruptions -->

        <com.android.settingslib.RestrictedPreference

                android:key="zen_mode"
@@ -84,11 +86,13 @@ 
            android:summary="@string/summary_placeholder"

            android:persistent="false"

            android:ringtoneType="alarm" />

    </PreferenceCategory>



    <!-- Other sounds -->

    <PreferenceCategory

          android:key="other_sound_preferecence_category"

          android:title="@string/other_sound_category_preference_title" />

          android:title="@string/other_sound_category_preference_title"

          android:order="-50">



        <!-- Dial pad tones -->

        <SwitchPreference
@@ -136,12 +140,14 @@ 
          android:key="emergency_tone"

          android:title="@string/emergency_tone_title"

          android:summary="%s" />

    </PreferenceCategory>



    <com.android.settingslib.RestrictedPreference

      android:key="cell_broadcast_settings"

      android:title="@string/cell_broadcast_settings"

      settings:useAdminDisabledSummary="true"

          settings:allowDividerAbove="true" >

      settings:allowDividerAbove="true"

      android:order="-1">

            <intent

              android:action="android.intent.action.MAIN"

              android:targetPackage="com.android.cellbroadcastreceiver"
@@ -150,7 +156,8 @@ 


    <com.android.settings.WorkOnlyCategory

        android:key="sound_work_settings_section"

            android:title="@string/sound_work_settings">

        android:title="@string/sound_work_settings"

        android:order="100">



                <!-- Use the same sounds of the work profile -->

                <SwitchPreference

src/com/android/settings/notification/SettingPrefController.java

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public abstract class SettingPrefController extends AbstractPreferenceController 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        mPreference.init(mParent);

        super.displayPreference(screen);

        if (isAvailable()) {

            mSettingsObserver = new SettingsObserver();

        }