Merge "Update surface positions for animations earlier" into main (79d53992) · Commits · e / os / android_frameworks_base

core/java/android/view/InsetsController.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -964,6 +964,13 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		}
		}

		if (mTmpControlArray.size() > 0) {
		// Update surface positions for animations.
		for (int i = mRunningAnimations.size() - 1; i >= 0; i--) {
		mRunningAnimations.get(i).runner.updateSurfacePosition(mTmpControlArray);
		}
		}

		@InsetsType int controllableTypes = 0;
		int consumedControlCount = 0;
		final @InsetsType int[] showTypes = new int[1];
		@@ -1006,13 +1013,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		.setControl(control, showTypes, hideTypes, cancelTypes, transientTypes);
		}
		}

		if (mTmpControlArray.size() > 0) {
		// Update surface positions for animations.
		for (int i = mRunningAnimations.size() - 1; i >= 0; i--) {
		mRunningAnimations.get(i).runner.updateSurfacePosition(mTmpControlArray);
		}
		}
		mTmpControlArray.clear();

		if (cancelTypes[0] != 0) {