Merge "Add ENABLE_ACCESSIBLE_CUSTOM_HEADERS to dev options" into main (62896ccd) · Commits · e / os / android_frameworks_base

core/java/android/window/DesktopModeFlags.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ public enum DesktopModeFlags {
		// All desktop mode related flags to be overridden by developer option toggle will be added here
		// go/keep-sorted start
		DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true),
		ENABLE_ACCESSIBLE_CUSTOM_HEADERS(Flags::enableAccessibleCustomHeaders, true),
		ENABLE_APP_HEADER_WITH_TASK_DENSITY(Flags::enableAppHeaderWithTaskDensity, true),
		ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION(Flags::enableCaptionCompatInsetForceConsumption,
		true),

+4 −3

Original line number	Diff line number	Diff line
		@@ -904,8 +904,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		* Whether to pilfer the next motion event to send cancellations to the windows below.
		* Useful when the caption window is spy and the gesture should be handled by the system
		* instead of by the app for their custom header content.
		* Should not have any effect when {@link Flags#enableAccessibleCustomHeaders()}, because
		* a spy window is not used then.
		* Should not have any effect when
		* {@link DesktopModeFlags#ENABLE_ACCESSIBLE_CUSTOM_HEADERS}, because a spy window is not
		* used then.
		*/
		private boolean mIsCustomHeaderGesture;
		private boolean mIsResizeGesture;
		@@ -1047,7 +1048,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		return false;
		}
		if (mInputManager != null
		&& !Flags.enableAccessibleCustomHeaders()) {
		&& !DesktopModeFlags.ENABLE_ACCESSIBLE_CUSTOM_HEADERS.isTrue()) {
		ViewRootImpl viewRootImpl = v.getViewRootImpl();
		if (viewRootImpl != null) {
		// Pilfer so that windows below receive cancellations for this gesture.

+1 −1

Original line number	Diff line number	Diff line
		@@ -935,7 +935,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		// The app is requesting to customize the caption bar, which means input on
		// customizable/exclusion regions must go to the app instead of to the system.
		// This may be accomplished with spy windows or custom touchable regions:
		if (Flags.enableAccessibleCustomHeaders()) {
		if (DesktopModeFlags.ENABLE_ACCESSIBLE_CUSTOM_HEADERS.isTrue()) {
		// Set the touchable region of the caption to only the areas where input should
		// be handled by the system (i.e. non custom-excluded areas). The region will
		// be calculated based on occluding caption elements and exclusion areas