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

Commit eaaa0b34 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Add category hierarchy for Display screen 

Bug: 368359268
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: atest
Change-Id: Ic0cbbfcadd74790962a7d70c37a6d721ec979c4f
parent e3f117f1

res/xml/display_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    settings:keywords="@string/keywords_display">



    <PreferenceCategory

        android:key="category_brightness"

        android:title="@string/category_name_brightness"

        android:order="-200">
@@ -44,6 +45,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_lock_display"

        android:title="@string/category_name_lock_display"

        android:order="-190">
@@ -79,6 +81,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_key_appearance"

        android:title="@string/category_name_appearance"

        android:order="-180">
@@ -133,6 +136,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_other"

        android:title="@string/category_name_display_controls"

        android:order="-150">

src/com/android/settings/display/DisplayScreen.kt

+18 −9
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.metadata.preferenceHierarchy 
import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme

import com.android.systemui.shared.Flags.ambientAod

import com.android.settingslib.metadata.PreferenceCategory as Category



@ProvidePreferenceScreen(DisplayScreen.KEY)

open class DisplayScreen :
@@ -57,17 +58,25 @@ open class DisplayScreen : 


    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

            +Category("category_brightness", R.string.category_name_brightness) order -200 += {

                +BrightnessLevelPreference()

                +AutoBrightnessScreen.KEY

            }

            +Category("category_lock_display", R.string.category_name_lock_display) order -190 += {

                +LockScreenPreferenceScreen.KEY

                if (ambientAod()) {

                    +AmbientDisplayAlwaysOnPreferenceScreen.KEY

                }

            }

            +Category("category_key_appearance", R.string.category_name_appearance) order -180 += {

                +DarkModeScreen.KEY

            }

            +Category("category_other", R.string.category_name_display_controls) order -150 += {

                +PeakRefreshRateSwitchPreference()

                if (Flags.catalystScreensaver()) {

                    +ScreensaverScreen.KEY

                }

            +PeakRefreshRateSwitchPreference()

            }

        }



    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =