Remove CurveProperties#pageParentScale
Test: Set TaskView#EDGE_SCALE_DOWN_FACTOR = 0.2f, then swipe down on the centermost TaskView; ensure it fills the screen. Alternatively, touch and hold the nav bar and ensure there is no jump in scale on the app window. Fixes: 169259407 Change-Id: Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321 Merged-In: Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321
This commit is contained in:
parent
107fe60f6e
commit
82ff64530e
|
@ -250,7 +250,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
|
|||
int start = mOrientationState.getOrientationHandler()
|
||||
.getPrimaryValue(mTaskRect.left, mTaskRect.top);
|
||||
mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
|
||||
mScrollState.pageParentScale = recentsViewScale.value;
|
||||
mScrollState.updateInterpolation(start);
|
||||
mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
|
||||
}
|
||||
|
|
|
@ -1390,13 +1390,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
|
|||
* Updates linearInterpolation for the provided child position
|
||||
*/
|
||||
public void updateInterpolation(float childStart) {
|
||||
float scaledHalfPageSize = halfPageSize / pageParentScale;
|
||||
float pageCenter = childStart + scaledHalfPageSize;
|
||||
float pageCenter = childStart + halfPageSize;
|
||||
float distanceFromScreenCenter = screenCenter - pageCenter;
|
||||
// How far the page has to move from the center to be offscreen, taking into account
|
||||
// the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
|
||||
float distanceToReachEdge = halfScreenSize
|
||||
+ scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
|
||||
+ halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
|
||||
linearInterpolation = Math.min(1,
|
||||
Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
|
||||
}
|
||||
|
|
|
@ -72,7 +72,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
|
|||
out.halfPageSize = view.getNormalChildHeight() / 2;
|
||||
out.halfScreenSize = view.getMeasuredHeight() / 2;
|
||||
out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
|
||||
out.pageParentScale = view.getScaleY();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -111,7 +111,6 @@ public interface PagedOrientationHandler {
|
|||
public int halfPageSize;
|
||||
public int screenCenter;
|
||||
public int halfScreenSize;
|
||||
public float pageParentScale;
|
||||
}
|
||||
|
||||
class ChildBounds {
|
||||
|
|
|
@ -70,7 +70,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
|
|||
out.halfPageSize = view.getNormalChildWidth() / 2;
|
||||
out.halfScreenSize = view.getMeasuredWidth() / 2;
|
||||
out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
|
||||
out.pageParentScale = view.getScaleX();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue