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

Commit 8fd3adc2 authored by Michael Jurka's avatar Michael Jurka
Browse files

Refactor RTL wallpaper code to use getLayoutTransitionOffsetForPage 

Bug: 11157913
parent da6ab129

src/com/android/launcher3/PagedView.java

+1 −7
Original line number Diff line number Diff line
@@ -268,8 +268,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 


    protected final Rect mInsets = new Rect();



    protected int mFirstChildLeft;



    public interface PageSwitchListener {

        void onPageSwitch(View newPage, int newPageIndex);

    }
@@ -899,10 +897,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        requestLayout();

    }



    protected int getFirstChildLeft() {

        return mFirstChildLeft;

    }



    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        if (!mIsDataReady || getChildCount() == 0) {
@@ -928,7 +922,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 


        int verticalPadding = getPaddingTop() + getPaddingBottom();



        int childLeft = mFirstChildLeft = offsetX + (screenWidth - getChildWidth(startIndex)) / 2;

        int childLeft = offsetX + (screenWidth - getChildWidth(startIndex)) / 2;

        if (mPageScrolls == null || getChildCount() != mChildCountOnLastLayout) {

            mPageScrolls = new int[getChildCount()];

        }

src/com/android/launcher3/Workspace.java

+1 −3
Original line number Diff line number Diff line
@@ -1199,10 +1199,8 @@ public class Workspace extends SmoothPagedView 
                // TODO: do different behavior if it's  a live wallpaper?

                // Sometimes the left parameter of the pages is animated during a layout transition;

                // this parameter offsets it to keep the wallpaper from animating as well

                int offsetForLayoutTransitionAnimation = isLayoutRtl() ?

                        getPageAt(getChildCount() - 1).getLeft() - getFirstChildLeft() : 0;

                int adjustedScroll =

                        getScrollX() - firstPageScrollX - offsetForLayoutTransitionAnimation;

                        getScrollX() - firstPageScrollX - getLayoutTransitionOffsetForPage(0);

                float offset = Math.min(1, adjustedScroll / (float) scrollRange);

                offset = Math.max(0, offset);

                // Don't use up all the wallpaper parallax until you have at least