Merge "Removed page spacing scaling" into sc-dev
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 83d15f7..64c3174 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -362,7 +362,6 @@
private final PointF mTempPointF = new PointF();
private final float[] mTempFloat = new float[1];
private final List<OnScrollChangedListener> mScrollListeners = new ArrayList<>();
- private float mFullscreenScale;
// The threshold at which we update the SystemUI flags when animating from the task into the app
public static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.85f;
@@ -1329,8 +1328,6 @@
// Compensate space caused by TaskView scaling.
float widthDiff =
taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale());
- // Compensate page spacing widening caused by RecentsView scaling.
- widthDiff += mPageSpacing * (1 - 1 / mFullscreenScale);
accumulatedTranslationX += mIsRtl ? widthDiff : -widthDiff;
}
@@ -2701,8 +2698,8 @@
// Update the pivots such that when the task is scaled, it fills the full page
getTaskSize(mTempRect);
- mFullscreenScale = getPagedViewOrientedState().getFullScreenScaleAndPivot(
- mTempRect, mActivity.getDeviceProfile(), mTempPointF);
+ getPagedViewOrientedState().getFullScreenScaleAndPivot(mTempRect,
+ mActivity.getDeviceProfile(), mTempPointF);
setPivotX(mTempPointF.x);
setPivotY(mTempPointF.y);
setTaskModalness(mTaskModalness);