diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java index ce71b07da8051..ebf1b841e9ae5 100644 --- a/core/java/android/view/InsetsAnimationControlImpl.java +++ b/core/java/android/view/InsetsAnimationControlImpl.java @@ -122,7 +122,8 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll mController.scheduleApplyChangeInsets(); } - void applyChangeInsets(InsetsState state) { + @VisibleForTesting + public void applyChangeInsets(InsetsState state) { final Insets offset = Insets.subtract(mShownInsets, mPendingInsets); ArrayList params = new ArrayList<>(); if (offset.left != 0) { diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index c2ade764ca811..13068dcf7681f 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -223,15 +223,18 @@ public class InsetsController implements WindowInsetsController { mState.dump(prefix + " ", pw); } - void dispatchAnimationStarted(WindowInsetsAnimationListener.InsetsAnimation animation) { + @VisibleForTesting + public void dispatchAnimationStarted(WindowInsetsAnimationListener.InsetsAnimation animation) { mViewRoot.mView.dispatchWindowInsetsAnimationStarted(animation); } - void dispatchAnimationFinished(WindowInsetsAnimationListener.InsetsAnimation animation) { + @VisibleForTesting + public void dispatchAnimationFinished(WindowInsetsAnimationListener.InsetsAnimation animation) { mViewRoot.mView.dispatchWindowInsetsAnimationFinished(animation); } - void scheduleApplyChangeInsets() { + @VisibleForTesting + public void scheduleApplyChangeInsets() { if (!mAnimCallbackScheduled) { mViewRoot.mChoreographer.postCallback(Choreographer.CALLBACK_INSETS_ANIMATION, mAnimCallback, null /* token*/); diff --git a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java index 81ca9109c6432..4270dc3d6c367 100644 --- a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java +++ b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java @@ -98,6 +98,7 @@ public class InsetsAnimationControlImplTest { @Test public void testChangeInsets() { mController.changeInsets(Insets.of(0, 30, 40, 0)); + mController.applyChangeInsets(new InsetsState()); assertEquals(Insets.of(0, 30, 40, 0), mController.getCurrentInsets()); ArgumentCaptor captor = ArgumentCaptor.forClass(SurfaceParams.class);