Simplify DesktopModeFlags (2bcc1ef6) · Commits · e / os / android_frameworks_base

core/java/android/window/DesktopExperienceFlags.java

+3 −10

Original line number	Original line	Diff line number	Diff line
	@@ -411,16 +411,9 @@ public enum DesktopExperienceFlags {

	/** Returns whether the toggle is overridden by the relevant system property.. */		/** Returns whether the toggle is overridden by the relevant system property.. */
	private static boolean isToggleOverriddenBySystem() {		private static boolean isToggleOverriddenBySystem() {
	// We never override if display content mode management is enabled.		// We never override if display content mode management is enabled or
	if (enableDisplayContentModeManagement()) {		// if the desktop experience dev option is not enabled in the build.
	return false;		if (enableDisplayContentModeManagement() \|\| !Flags.showDesktopExperienceDevOption()) {
	}
	final Context context = getApplicationContext();
	if (context == null) {
	return false;
	}
	// If the developer option is not supported, we don't override.
	if (!isDesktopExperienceDevOptionSupported()) {
	return false;		return false;
	}		}
	return SystemProperties.getBoolean(SYSTEM_PROPERTY_NAME, false);		return SystemProperties.getBoolean(SYSTEM_PROPERTY_NAME, false);

core/java/android/window/DesktopModeFlags.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -260,7 +260,7 @@ public enum DesktopModeFlags {
	* Returns {@link ToggleOverride} from Settings.Global set by toggle.		* Returns {@link ToggleOverride} from Settings.Global set by toggle.
	*/		*/
	private static ToggleOverride getToggleOverrideFromSystem() {		private static ToggleOverride getToggleOverrideFromSystem() {
	if (DesktopExperienceFlags.isDesktopExperienceDevOptionSupported()) {		if (Flags.showDesktopExperienceDevOption()) {
	if (DesktopExperienceFlags.getToggleOverride()) {		if (DesktopExperienceFlags.getToggleOverride()) {
	return ToggleOverride.OVERRIDE_ON;		return ToggleOverride.OVERRIDE_ON;
	}		}

core/tests/coretests/src/android/window/DesktopModeFlagsTest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -505,7 +505,7 @@ public class DesktopModeFlagsTest {
	}		}

	private boolean showDesktopWindowingDevOpts() {		private boolean showDesktopWindowingDevOpts() {
	return Flags.showDesktopWindowingDevOption() && !showDesktopExperienceDevOpts();		return Flags.showDesktopWindowingDevOption() && !Flags.showDesktopExperienceDevOption();
	}		}

	private boolean showDesktopExperienceDevOpts() {		private boolean showDesktopExperienceDevOpts() {
	@@ -513,7 +513,7 @@ public class DesktopModeFlagsTest {
	}		}

	private boolean showAnyDevOpts() {		private boolean showAnyDevOpts() {
	return Flags.showDesktopWindowingDevOption() \|\| showDesktopExperienceDevOpts();		return Flags.showDesktopWindowingDevOption() \|\| Flags.showDesktopExperienceDevOption();
	}		}

	private void setDesktopModeSupported(boolean isSupported) {		private void setDesktopModeSupported(boolean isSupported) {

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

+16 −5

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ public class DesktopModeStatus {
	*/		*/
	public static boolean canShowDesktopExperienceDevOption(@NonNull Context context) {		public static boolean canShowDesktopExperienceDevOption(@NonNull Context context) {
	return Flags.showDesktopExperienceDevOption()		return Flags.showDesktopExperienceDevOption()
	&& isDeviceEligibleForDesktopMode(context);		&& isDeviceEligibleForDesktopExperienceDevOption(context);
	}		}

	/** Returns if desktop mode dev option should be enabled if there is no user override. */		/** Returns if desktop mode dev option should be enabled if there is no user override. */
	@@ -222,11 +222,9 @@ public class DesktopModeStatus {
	}		}

	/**		/**
	* Return {@code true} if the developer option for desktop mode is unrestricted and is supported		* Return {@code true} if the developer option for desktop mode is supported on this device.
	* in the device.
	*		*
	* Note that, if {@link #isDeviceEligibleForDesktopMode(Context)} is true, then		* <p> This method doesn't check if the developer option flag is enabled or not.
	* {@link #isDeviceEligibleForDesktopModeDevOption(Context)} is also true.
	*/		*/
	private static boolean isDeviceEligibleForDesktopModeDevOption(@NonNull Context context) {		private static boolean isDeviceEligibleForDesktopModeDevOption(@NonNull Context context) {
	if (!enforceDeviceRestrictions()) {		if (!enforceDeviceRestrictions()) {
	@@ -237,6 +235,19 @@ public class DesktopModeStatus {
	return desktopModeSupported \|\| isDesktopModeDevOptionSupported(context);		return desktopModeSupported \|\| isDesktopModeDevOptionSupported(context);
	}		}

			/**
			* Return {@code true} if the developer option for desktop experience is supported on this
			* device.
			*
			* <p> This method doesn't check if the developer option flag is enabled or not.
			*/
			private static boolean isDeviceEligibleForDesktopExperienceDevOption(@NonNull Context context) {
			if (!enforceDeviceRestrictions()) {
			return true;
			}
			return isDesktopModeSupported(context) \|\| isDesktopModeDevOptionSupported(context);
			}

	/**		/**
	* @return {@code true} if this device has an internal large screen		* @return {@code true} if this device has an internal large screen
	*/		*/

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,11 @@ class DesktopStateImpl(context: Context) : DesktopState {
	desktopModeEnabled \|\| isDesktopModeEnabledByDevOption		desktopModeEnabled \|\| isDesktopModeEnabledByDevOption
	}		}

			private val isDeviceEligibleForDesktopExperienceDevOption =
			!enforceDeviceRestrictions \|\| isDesktopModeSupported \|\| isDesktopModeDevOptionSupported

	override val canShowDesktopExperienceDevOption: Boolean =		override val canShowDesktopExperienceDevOption: Boolean =
	Flags.showDesktopExperienceDevOption() && isDeviceEligibleForDesktopMode		Flags.showDesktopExperienceDevOption() && isDeviceEligibleForDesktopExperienceDevOption

	override val enterDesktopByDefaultOnFreeformDisplay: Boolean =		override val enterDesktopByDefaultOnFreeformDisplay: Boolean =
	DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue \|\|		DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue \|\|