Merge "Refine some preference name" into main

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<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

@@ -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

@@ -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()