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

Commit 5642811b authored by Sunny Shao's avatar Sunny Shao
Browse files

Refine some preference name 

Test: atest DisplayScreenTest
Bug: 368359268
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: I73ed10a3a0bee2dc91a0a4247fb08842db70a2d4
parent 5a06b74e

src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt→src/com/android/settings/display/BrightnessLevelPreference.kt

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import com.android.settingslib.transition.SettingsTransitionHelper 
import java.text.NumberFormat



// LINT.IfChange

class BrightnessLevelRestrictedPreference :

class BrightnessLevelPreference :

    PreferenceMetadata,

    PreferenceBinding,

    PreferenceRestrictionMixin,
@@ -87,7 +87,7 @@ class BrightnessLevelRestrictedPreference : 
    override fun onStart(context: PreferenceLifecycleContext) {

        val observer =

            KeyedObserver<String> { _, _ ->

                context.notifyPreferenceChange(this@BrightnessLevelRestrictedPreference)

                context.notifyPreferenceChange(this@BrightnessLevelPreference)

            }

        brightnessObserver = observer

        SettingsSystemStore.get(context)
@@ -100,7 +100,7 @@ class BrightnessLevelRestrictedPreference : 
                override fun onDisplayRemoved(displayId: Int) {}



                override fun onDisplayChanged(displayId: Int) {

                    context.notifyPreferenceChange(this@BrightnessLevelRestrictedPreference)

                    context.notifyPreferenceChange(this@BrightnessLevelPreference)

                }

            }

        displayListener = listener

src/com/android/settings/display/BrightnessLevelPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -188,4 +188,4 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle 
        return (value - min) / (max - min);

    }

}

// LINT.ThenChange(BrightnessLevelRestrictedPreference.kt)
 
// LINT.ThenChange(BrightnessLevelPreference.kt)

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ open class DisplayScreen : 
    override fun fragmentClass() = DisplaySettings::class.java



    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {

        +BrightnessLevelRestrictedPreference()

        +BrightnessLevelPreference()

        +AutoBrightnessScreen.KEY

        +DarkModeScreen.KEY

        +PeakRefreshRateSwitchPreference()