Merge "Fix duration and insetsInterpolator when the IME is shown in landscape" into main (05d18f1b) · Commits · e / os / android_frameworks_base

core/java/android/view/InsetsController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -488,7 +488,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		@Override
		public Interpolator getInsetsInterpolator(boolean hasZeroInsetsIme) {
		if ((mRequestedTypes & ime()) != 0) {
		if (mHasAnimationCallbacks && hasZeroInsetsIme) {
		if (mHasAnimationCallbacks && !hasZeroInsetsIme) {
		return SYNC_IME_INTERPOLATOR;
		} else if (mShow) {
		return LINEAR_OUT_SLOW_IN_INTERPOLATOR;
		@@ -536,7 +536,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		@Override
		public long getDurationMs(boolean hasZeroInsetsIme) {
		if ((mRequestedTypes & ime()) != 0) {
		if (mHasAnimationCallbacks && hasZeroInsetsIme) {
		if (mHasAnimationCallbacks && !hasZeroInsetsIme) {
		return ANIMATION_DURATION_SYNC_IME_MS;
		} else {
		return ANIMATION_DURATION_UNSYNC_IME_MS;