Merge "Fix split animation for grid RTL" into sc-v2-dev (d1c9cd27) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/views/FloatingTaskView.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class FloatingTaskView extends FrameLayout {
		public void update(RectF position, float progress, float windowRadius) {
		MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();

		float dX = position.left - lp.getMarginStart();
		float dX = position.left - mStartingPosition.left;
		float dY = position.top - lp.topMargin;

		setTranslationX(dX);
		@@ -160,10 +160,15 @@ public class FloatingTaskView extends FrameLayout {
		lp.ignoreInsets = true;
		// Position the floating view exactly on top of the original
		lp.topMargin = Math.round(pos.top);
		if (mIsRtl) {
		lp.setMarginStart(mLauncher.getDeviceProfile().widthPx - Math.round(pos.right));
		} else {
		lp.setMarginStart(Math.round(pos.left));
		}

		// Set the properties here already to make sure they are available when running the first
		// animation frame.
		int left = lp.leftMargin;
		int left = (int) pos.left;
		layout(left, lp.topMargin, left + lp.width, lp.topMargin + lp.height);
		}