From 5642811b6e8e9cdf444c00cd6d46da900217cded Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Sat, 9 Nov 2024 23:54:56 +0800 Subject: [PATCH] Refine some preference name Test: atest DisplayScreenTest Bug: 368359268 Flag: com.android.settings.flags.catalyst_display_settings_screen Change-Id: I73ed10a3a0bee2dc91a0a4247fb08842db70a2d4 --- ...RestrictedPreference.kt => BrightnessLevelPreference.kt} | 6 +++--- .../display/BrightnessLevelPreferenceController.java | 2 +- src/com/android/settings/display/DisplayScreen.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/com/android/settings/display/{BrightnessLevelRestrictedPreference.kt => BrightnessLevelPreference.kt} (98%) diff --git a/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt b/src/com/android/settings/display/BrightnessLevelPreference.kt similarity index 98% rename from src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt rename to src/com/android/settings/display/BrightnessLevelPreference.kt index 4398f210907..215f6b8d8ed 100644 --- a/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt +++ b/src/com/android/settings/display/BrightnessLevelPreference.kt @@ -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 { _, _ -> - 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 diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 33579ac38a4..269114643fb 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -188,4 +188,4 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle return (value - min) / (max - min); } } -// LINT.ThenChange(BrightnessLevelRestrictedPreference.kt) +// LINT.ThenChange(BrightnessLevelPreference.kt) diff --git a/src/com/android/settings/display/DisplayScreen.kt b/src/com/android/settings/display/DisplayScreen.kt index 5435ae25228..422ea67618a 100644 --- a/src/com/android/settings/display/DisplayScreen.kt +++ b/src/com/android/settings/display/DisplayScreen.kt @@ -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()