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

Commit c635e76d authored by Samridhi's avatar Samridhi Committed by Automerger Merge Worker
Browse files

Merge "Add order to display settings" into 24D1-dev am: 790abeba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26639338



Change-Id: Iee8907af5ca2dab78d10b09d96685b9e643d1d1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee6c2f46 790abeba

res/xml/display_settings.xml

+10 −5
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
    settings:keywords="@string/keywords_display">



    <PreferenceCategory

        android:title="@string/category_name_brightness">

        android:title="@string/category_name_brightness"

        android:order="-200">



        <com.android.settingslib.RestrictedPreference

            android:key="brightness"
@@ -44,7 +45,8 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_lock_display">

        android:title="@string/category_name_lock_display"

        android:order="-190">



        <Preference

            android:key="lockscreen_from_display_settings"
@@ -69,7 +71,8 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_appearance">

        android:title="@string/category_name_appearance"

        android:order="-180">



        <com.android.settings.display.darkmode.DarkModePreference

            android:key="dark_ui_mode"
@@ -89,7 +92,8 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_color">

        android:title="@string/category_name_color"

        android:order="-170">



        <com.android.settingslib.PrimarySwitchPreference

            android:key="night_display"
@@ -107,7 +111,8 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_display_controls">

        android:title="@string/category_name_display_controls"

        android:order="-150">



        <!--

            Standard auto-rotation preference that will be shown when device state based