Merge "Re-land: Clean up alwaysConsumeSystemBars" into main (69a12166) · Commits · e / os / android_frameworks_base

core/java/android/view/IWindowManager.aidl

+1 −3

Original line number	Diff line number	Diff line
		@@ -845,10 +845,8 @@ interface IWindowManager

		/**
		* Called to get the expected window insets.
		*
		* @return {@code true} if system bars are always consumed.
		*/
		boolean getWindowInsets(int displayId, in IBinder token, out InsetsState outInsetsState);
		void getWindowInsets(int displayId, in IBinder token, out InsetsState outInsetsState);

		/**
		* Returns a list of {@link android.view.DisplayInfo} for the logical display. This is not

core/java/android/view/View.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -32381,13 +32381,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		final Rect mCaptionInsets = new Rect();

		/**
		* In multi-window we force show the system bars. Because we don't want that the surface
		* size changes in this mode, we instead have a flag whether the system bars sizes should
		* always be consumed, so the app is treated like there are no virtual system bars at all.
		*/
		boolean mAlwaysConsumeSystemBars;

		/**
		* The internal insets given by this window. This value is
		* supplied by the client (through

core/java/android/view/ViewRootImpl.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
		import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
		import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS;
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_CANCEL_AND_REDRAW;
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS;
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED;
		import static android.view.accessibility.Flags.a11ySequentialFocusStartingPoint;
		import static android.view.accessibility.Flags.forceInvertColor;
		@@ -867,7 +866,6 @@ public final class ViewRootImpl implements ViewParent,

		final Rect mPendingBackDropFrame = new Rect();

		boolean mPendingAlwaysConsumeSystemBars;
		private int mRelayoutSeq;
		private final Rect mWinFrameInScreen = new Rect();
		private final InsetsState mTempInsets = new InsetsState();
		@@ -1637,9 +1635,6 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		mAttachInfo.mAlwaysConsumeSystemBars =
		(res & WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_SYSTEM_BARS) != 0;
		mPendingAlwaysConsumeSystemBars = mAttachInfo.mAlwaysConsumeSystemBars;
		handleInsetsControlChanged(mTempInsets, mTempControls);
		final InsetsState state = mInsetsController.getState();
		final Rect displayCutoutSafe = mTempRect;
		@@ -2366,7 +2361,6 @@ public final class ViewRootImpl implements ViewParent,
		}

		mForceNextWindowRelayout \|= forceLayout;
		mPendingAlwaysConsumeSystemBars = false;
		mSyncSeqId = seqId > mSyncSeqId ? seqId : mSyncSeqId;

		if (reportDraw) {
		@@ -3936,8 +3930,6 @@ public final class ViewRootImpl implements ViewParent,
		surfaceSizeChanged = true;
		mLastSurfaceSize.set(mSurfaceSize.x, mSurfaceSize.y);
		}
		final boolean alwaysConsumeSystemBarsChanged =
		mPendingAlwaysConsumeSystemBars != mAttachInfo.mAlwaysConsumeSystemBars;
		updateColorModeIfNeeded(lp.getColorMode(), lp.getDesiredHdrHeadroom());
		surfaceCreated = !hadSurface && mSurface.isValid();
		surfaceDestroyed = hadSurface && !mSurface.isValid();
		@@ -3955,10 +3947,6 @@ public final class ViewRootImpl implements ViewParent,
		mHandler.sendEmptyMessageDelayed(MSG_SURFACE_REPLACED_TIMEOUT,
		FRAME_RATE_SURFACE_REPLACED_TIME);
		}
		if (alwaysConsumeSystemBarsChanged) {
		mAttachInfo.mAlwaysConsumeSystemBars = mPendingAlwaysConsumeSystemBars;
		dispatchApplyInsets = true;
		}
		if (dispatchApplyInsets \|\| mLastSystemUiVisibility !=
		mAttachInfo.mSystemUiVisibility \|\| mApplyInsetsRequested) {
		mLastSystemUiVisibility = mAttachInfo.mSystemUiVisibility;
		@@ -9635,9 +9623,6 @@ public final class ViewRootImpl implements ViewParent,
		mInvCompatScale = 1f / mTmpFrames.compatScale;
		CompatibilityInfo.applyOverrideIfNeeded(mPendingMergedConfiguration);
		handleInsetsControlChanged(mTempInsets, mTempControls);

		mPendingAlwaysConsumeSystemBars =
		(relayoutResult & RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS) != 0;
		}

		final int transformHint = SurfaceControl.rotationToBufferTransform(

core/java/android/view/WindowInsets.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -1690,14 +1690,6 @@ public final class WindowInsets {
		return this;
		}

		/** @hide */
		@NonNull
		public Builder setAlwaysConsumeSystemBars(boolean alwaysConsumeSystemBars) {
		// TODO (b/277891341): Remove this and related usages. This has been replaced by
		// #setForceConsumingTypes.
		return this;
		}

		/** @hide */
		@NonNull
		public Builder setForceConsumingTypes(@InsetsType int forceConsumingTypes) {

core/java/android/view/WindowManagerGlobal.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -101,17 +101,10 @@ public final class WindowManagerGlobal {
		*/
		public static final int RELAYOUT_RES_SURFACE_RESIZED = 1 << 2;

		/**
		* In multi-window we force show the system bars. Because we don't want that the surface size
		* changes in this mode, we instead have a flag whether the system bar sizes should always be
		* consumed, so the app is treated like there is no virtual system bars at all.
		*/
		public static final int RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS = 1 << 3;

		/**
		* The window manager has told the window it cannot draw this frame and should retry again.
		*/
		public static final int RELAYOUT_RES_CANCEL_AND_REDRAW = 1 << 4;
		public static final int RELAYOUT_RES_CANCEL_AND_REDRAW = 1 << 3;

		/**
		* Flag for relayout: the client will be later giving
		@@ -123,12 +116,6 @@ public final class WindowManagerGlobal {
		public static final int ADD_FLAG_IN_TOUCH_MODE = 0x1;
		public static final int ADD_FLAG_APP_VISIBLE = 0x2;

		/**
		* Like {@link #RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS}, but as a "hint" when adding the
		* window.
		*/
		public static final int ADD_FLAG_ALWAYS_CONSUME_SYSTEM_BARS = 0x4;

		public static final int ADD_OKAY = 0;
		public static final int ADD_BAD_APP_TOKEN = -1;
		public static final int ADD_BAD_SUBWINDOW_TOKEN = -2;