Merge "Re-land: Make window stable while resizing" into sc-dev am: 5905279553 (eca9c1e0) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4293,7 +4293,7 @@ public final class ViewRootImpl implements ViewParent,
		mChoreographer.getFrameTimeNanos() / TimeUtils.NANOS_PER_MS;

		boolean useAsyncReport = false;
		if (!dirty.isEmpty() \|\| mIsAnimating \|\| accessibilityFocusDirty) {
		if (!dirty.isEmpty() \|\| mIsAnimating \|\| accessibilityFocusDirty \|\| mNextDrawUseBlastSync) {
		if (isHardwareEnabled()) {
		// If accessibility focus moved, always invalidate the root.
		boolean invalidateRoot = accessibilityFocusDirty \|\| mInvalidateRootRequested;

core/java/com/android/internal/policy/PhoneWindow.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -2508,6 +2509,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (mDecor.mForceWindowDrawsBarBackgrounds) {
		params.privateFlags \|= PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS;
		}
		params.privateFlags \|= PRIVATE_FLAG_NO_MOVE_ANIMATION;
		}
		if (a.getBoolean(R.styleable.Window_windowLightStatusBar, false)) {
		decor.setSystemUiVisibility(

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+15 −28

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import static com.android.server.wm.InsetsSourceProviderProto.CONTROLLABLE;
		import static com.android.server.wm.InsetsSourceProviderProto.CONTROL_TARGET;
		import static com.android.server.wm.InsetsSourceProviderProto.FAKE_CONTROL;
		import static com.android.server.wm.InsetsSourceProviderProto.FAKE_CONTROL_TARGET;
		import static com.android.server.wm.InsetsSourceProviderProto.FINISH_SEAMLESS_ROTATE_FRAME_NUMBER;
		import static com.android.server.wm.InsetsSourceProviderProto.FRAME;
		import static com.android.server.wm.InsetsSourceProviderProto.IME_OVERRIDDEN_FRAME;
		import static com.android.server.wm.InsetsSourceProviderProto.IS_LEASH_READY_FOR_DISPATCHING;
		@@ -60,6 +59,7 @@ import com.android.server.wm.SurfaceAnimator.AnimationType;
		import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;

		import java.io.PrintWriter;
		import java.util.function.Consumer;

		/**
		* Controller for a specific inset source on the server. It's called provider as it provides the
		@@ -85,6 +85,16 @@ class InsetsSourceProvider {
		private final Rect mImeOverrideFrame = new Rect();
		private boolean mIsLeashReadyForDispatching;

		private final Consumer<Transaction> mSetLeashPositionConsumer = t -> {
		if (mControl != null) {
		final SurfaceControl leash = mControl.getLeash();
		if (leash != null) {
		final Point position = mControl.getSurfacePosition();
		t.setPosition(leash, position.x, position.y);
		}
		}
		};

		/** The visibility override from the current controlling window. */
		private boolean mClientVisible;

		@@ -151,7 +161,6 @@ class InsetsSourceProvider {
		// TODO: Ideally, we should wait for the animation to finish so previous window can
		// animate-out as new one animates-in.
		mWin.cancelAnimation();
		mWin.mPendingPositionChanged = null;
		mWin.mProvidedInsetsSources.remove(mSource.getType());
		}
		ProtoLog.d(WM_DEBUG_IME, "InsetsSource setWin %s", win);
		@@ -252,12 +261,11 @@ class InsetsSourceProvider {
		final Point position = getWindowFrameSurfacePosition();
		if (mControl.setSurfacePosition(position.x, position.y) && mControlTarget != null) {
		changed = true;
		if (!mWin.getWindowFrames().didFrameSizeChange()) {
		updateLeashPosition(-1 /* frameNumber */);
		} else if (mWin.mInRelayout) {
		updateLeashPosition(mWin.getFrameNumber());
		if (mWin.getWindowFrames().didFrameSizeChange() && mWin.mWinAnimator.getShown()
		&& mWin.okToDisplay()) {
		mWin.applyWithNextDraw(mSetLeashPositionConsumer);
		} else {
		mWin.mPendingPositionChanged = this;
		mSetLeashPositionConsumer.accept(mWin.getPendingTransaction());
		}
		}
		final Insets insetsHint = mSource.calculateInsets(
		@@ -272,19 +280,6 @@ class InsetsSourceProvider {
		}
		}

		void updateLeashPosition(long frameNumber) {
		if (mControl == null) {
		return;
		}
		final SurfaceControl leash = mControl.getLeash();
		if (leash != null) {
		final Transaction t = mDisplayContent.getPendingTransaction();
		final Point position = mControl.getSurfacePosition();
		t.setPosition(leash, position.x, position.y);
		deferTransactionUntil(t, leash, frameNumber);
		}
		}

		private Point getWindowFrameSurfacePosition() {
		final Rect frame = mWin.getFrame();
		final Point position = new Point();
		@@ -292,14 +287,6 @@ class InsetsSourceProvider {
		return position;
		}

		private void deferTransactionUntil(Transaction t, SurfaceControl leash, long frameNumber) {
		if (frameNumber >= 0) {
		final SurfaceControl barrier = mWin.getClientViewRootSurface();
		t.deferTransactionUntil(mWin.getSurfaceControl(), barrier, frameNumber);
		t.deferTransactionUntil(leash, barrier, frameNumber);
		}
		}

		/**
		* @see InsetsStateController#onControlFakeTargetChanged(int, InsetsControlTarget)
		*/

services/core/java/com/android/server/wm/WindowFrames.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ public class WindowFrames {
		}

		/**
		* @return true if the width or height has changed since last reported to the client.
		* @return true if the width or height has changed since last updating resizing window.
		*/
		boolean didFrameSizeChange() {
		return (mLastFrame.width() != mFrame.width()) \|\| (mLastFrame.height() != mFrame.height());
		@@ -134,6 +134,13 @@ public class WindowFrames {
		return mLastForceReportingResized \|\| mFrameSizeChanged;
		}

		/**
		* @return true if the width or height has changed since last reported to the client.
		*/
		boolean isFrameSizeChangeReported() {
		return mFrameSizeChanged \|\| didFrameSizeChange();
		}

		/**
		* Resets the size changed flags so they're all set to false again. This should be called
		* after the frames are reported to client.

services/core/java/com/android/server/wm/WindowManagerService.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -2228,13 +2228,6 @@ public class WindowManagerService extends IWindowManager.Stub

		win.setFrameNumber(frameNumber);

		final DisplayContent dc = win.getDisplayContent();

		if (win.mPendingPositionChanged != null) {
		win.mPendingPositionChanged.updateLeashPosition(frameNumber);
		win.mPendingPositionChanged = null;
		}

		int attrChanges = 0;
		int flagChanges = 0;
		int privateFlagChanges = 0;