Merge "[Catalyst] Add highlight and metric key for some Display sub-screenes" into main (3ceee5be) · Commits · e / os / android_packages_apps_Settings

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -15,14 +15,17 @@
		*/
		package com.android.settings.display

		import android.app.settings.SettingsEnums
		import android.app.settings.SettingsEnums.ACTION_AMBIENT_DISPLAY_ALWAYS_ON
		import android.content.Context
		import android.hardware.display.AmbientDisplayConfiguration
		import android.os.SystemProperties
		import android.os.UserHandle
		import android.os.UserManager
		import com.android.settings.CatalystFragment
		import com.android.settings.R
		import com.android.settings.contract.KEY_AMBIENT_DISPLAY_ALWAYS_ON
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime
		import com.android.settings.display.ambient.AmbientDisplayMainSwitchPreference
		import com.android.settings.display.ambient.AmbientDisplayStorage
		@@ -43,8 +46,6 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceFragment
		import com.android.settingslib.preference.PreferenceScreenCreator
		import com.android.systemui.shared.Flags.ambientAod

		// LINT.IfChange
		@@ -53,10 +54,10 @@ import com.android.systemui.shared.Flags.ambientAod
		* subpage for additional related settings.
		*/
		@ProvidePreferenceScreen(AmbientDisplayAlwaysOnPreferenceScreen.KEY)
		class AmbientDisplayAlwaysOnPreferenceScreen :
		open class AmbientDisplayAlwaysOnPreferenceScreen :
		BooleanValuePreference,
		PreferenceActionMetricsProvider,
		PreferenceScreenCreator,
		PreferenceScreenMixin,
		PrimarySwitchPreferenceBinding,
		PreferenceAvailabilityProvider,
		PreferenceRestrictionMixin,
		@@ -74,6 +75,11 @@ class AmbientDisplayAlwaysOnPreferenceScreen :
		override val keywords: Int
		get() = R.string.keywords_always_show_time_info

		override fun getMetricsCategory() = SettingsEnums.AMBIENT_DISPLAY_ALWAYS_ON

		override val highlightMenuKey: Int
		get() = R.string.menu_key_display

		override val preferenceActionMetrics: Int
		get() = ACTION_AMBIENT_DISPLAY_ALWAYS_ON

		@@ -143,7 +149,7 @@ class AmbientDisplayAlwaysOnPreferenceScreen :

		// LINT.ThenChange(AmbientDisplayAlwaysOnPreferenceController.java)

		class AmbientPreferenceFragment : PreferenceFragment() {
		class AmbientPreferenceFragment : CatalystFragment() {
		override fun getPreferenceScreenBindingKey(context: Context): String {
		return AmbientDisplayAlwaysOnPreferenceScreen.KEY
		}

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -16,19 +16,20 @@

		package com.android.settings.display

		import android.app.settings.SettingsEnums
		import android.content.Context
		import com.android.settings.R
		import com.android.settings.Settings.ScreenTimeoutActivity
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.flags.Flags
		import com.android.settings.utils.makeLaunchIntent
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator

		// TODO(b/368359967): The entry point logic is not yet migrated
		@ProvidePreferenceScreen(ScreenTimeoutScreen.KEY)
		open class ScreenTimeoutScreen : PreferenceScreenCreator {
		open class ScreenTimeoutScreen : PreferenceScreenMixin {

		override val key: String
		get() = KEY
		@@ -36,6 +37,11 @@ open class ScreenTimeoutScreen : PreferenceScreenCreator {
		override val title: Int
		get() = R.string.screen_timeout

		override val highlightMenuKey: Int
		get() = R.string.menu_key_display

		override fun getMetricsCategory() = SettingsEnums.SCREEN_TIMEOUT

		override fun isFlagEnabled(context: Context) = Flags.catalystScreenTimeout()

		override fun fragmentClass() = ScreenTimeoutSettings::class.java