Merge "Add Desktop Experience flag names in Settings." into main (d7000df2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/connecteddevice/display/DesktopExperienceFlags.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.display

		import android.window.DesktopExperienceFlags.DesktopExperienceFlag
		import com.android.settings.flags.FeatureFlags
		import com.android.settings.flags.Flags

		/** Class handling Settings flags, but using the Desktop Experience developer option overrides. */
		class DesktopExperienceFlags(private val featureFlagsImpl: FeatureFlags) : FeatureFlags by featureFlagsImpl {
		@@ -25,6 +26,7 @@ class DesktopExperienceFlags(private val featureFlagsImpl: FeatureFlags) : Featu
		DesktopExperienceFlag(
		featureFlagsImpl::displayTopologyPaneInDisplayList,
		/* shouldOverrideByDevOption= */ true,
		Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST,
		)

		override fun displayTopologyPaneInDisplayList(): Boolean =
		@@ -34,6 +36,7 @@ class DesktopExperienceFlags(private val featureFlagsImpl: FeatureFlags) : Featu
		DesktopExperienceFlag(
		featureFlagsImpl::displaySizeConnectedDisplaySetting,
		/* shouldOverrideByDevOption= */ true,
		Flags.FLAG_DISPLAY_SIZE_CONNECTED_DISPLAY_SETTING,
		)

		override fun displaySizeConnectedDisplaySetting(): Boolean =