Merge "Revert "DMWindowDecor: Call layout again when we are finished wi..."" into main (e44defd0) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -667,14 +667,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		mBgExecutor.execute(mLoadAppInfoRunnable);
		}

		/**
		* Does a relayout without any new changes.
		* This is used if other states have changed (e.g. {@link mIsRecentsTransitionRunning}.
		*/
		private void relayout() {
		relayout(mTaskInfo, mHasGlobalFocus, mExclusionRegion);
		}

		private boolean showInputLayer() {
		if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue()) {
		return isCaptionVisible();
		@@ -1966,11 +1958,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		*/
		void setIsRecentsTransitionRunning(boolean isRecentsTransitionRunning) {
		mIsRecentsTransitionRunning = isRecentsTransitionRunning;
		// TODO (b/394791828): Remove this once we can remove the input layer.
		if (DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue()
		&& !isRecentsTransitionRunning) {
		relayout();
		}
		}

		/**