Merge "Fix messed-up divider position when unlocking with IME showing" into main (99c3e6ae) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -2177,11 +2177,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mDividerFadeInAnimator.cancel();
		}

		mSplitLayout.getRefDividerBounds(mTempRect1);
		if (t != null) {
		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);
		t.setVisibility(dividerLeash, mDividerVisible);
		t.setLayer(dividerLeash, Integer.MAX_VALUE);
		t.setPosition(dividerLeash, mTempRect1.left, mTempRect1.top);
		} else if (mDividerVisible) {
		final SurfaceControl.Transaction transaction = mTransactionPool.acquire();
		mDividerFadeInAnimator = ValueAnimator.ofFloat(0f, 1f);
		@@ -2201,11 +2199,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mDividerFadeInAnimator.cancel();
		return;
		}
		mSplitLayout.getRefDividerBounds(mTempRect1);
		updateSurfaceBounds(mSplitLayout, transaction, false /* applyResizingOffset */);
		transaction.show(dividerLeash);
		transaction.setAlpha(dividerLeash, 0);
		transaction.setLayer(dividerLeash, Integer.MAX_VALUE);
		transaction.setPosition(dividerLeash, mTempRect1.left, mTempRect1.top);
		transaction.apply();
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import static org.junit.Assert.assertEquals;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.ArgumentMatchers.notNull;
		import static org.mockito.Mockito.atLeastOnce;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		@@ -296,7 +297,8 @@ public class StageCoordinatorTests extends ShellTestCase {
		public void testFinishEnterSplitScreen_applySurfaceLayout() {
		mStageCoordinator.finishEnterSplitScreen(new SurfaceControl.Transaction());

		verify(mSplitLayout).applySurfaceChanges(any(), any(), any(), any(), any(), eq(false));
		verify(mSplitLayout, atLeastOnce())
		.applySurfaceChanges(any(), any(), any(), any(), any(), eq(false));
		}

		@Test