Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e4a8f51 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove CurveProperties#pageParentScale" into ub-launcher3-rvc-qpr-dev

parents 83cf9211 82ff6453

quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java

+0 −1
Original line number Diff line number Diff line
@@ -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);

        }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+2 −3
Original line number Diff line number Diff line
@@ -1386,13 +1386,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);

        }

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+0 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/launcher3/touch/PagedOrientationHandler.java

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ public interface PagedOrientationHandler { 
        public int halfPageSize;

        public int screenCenter;

        public int halfScreenSize;

        public float pageParentScale;

    }



    class ChildBounds {

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

+0 −1
Original line number Diff line number Diff line
@@ -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