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

Commit 8ccd877f authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Adjusts Clear all to be vertically centered with the tasks." into ub-launcher3-master

parents 7f28b881 17d0080c

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

+5 −1
Original line number Diff line number Diff line
@@ -45,12 +45,15 @@ public class ClearAllButton extends Button implements PageCallbacks { 
    private float mVisibilityAlpha = 1;



    private boolean mIsRtl;

    private final float mOriginalTranslationX, mOriginalTranslationY;



    private int mScrollOffset;



    public ClearAllButton(Context context, AttributeSet attrs) {

        super(context, attrs);

        mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;

        mOriginalTranslationX = getTranslationX();

        mOriginalTranslationY = getTranslationY();

    }



    @Override
@@ -99,7 +102,8 @@ public class ClearAllButton extends Button implements PageCallbacks { 


        float shift = Math.min(scrollState.scrollFromEdge, orientationSize);

        float translation = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);

        orientationHandler.setPrimaryAndResetSecondaryTranslate(this, translation);

        orientationHandler.setPrimaryAndResetSecondaryTranslate(

                this, translation, mOriginalTranslationX, mOriginalTranslationY);

        mScrollAlpha = 1 - shift / orientationSize;

        updateAlpha();

    }

quickstep/res/layout/overview_clear_all_button.xml

+1 −2
Original line number Diff line number Diff line
@@ -23,5 +23,4 @@ 
    android:text="@string/recents_clear_all"

    android:textColor="?attr/workspaceTextColor"

    android:textSize="14sp"

    android:translationY="@dimen/task_thumbnail_half_top_margin"

    />
 
 No newline at end of file
 
    android:translationY="@dimen/task_thumbnail_half_top_margin" />
 
 No newline at end of file

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

+3 −2
Original line number Diff line number Diff line
@@ -148,8 +148,9 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 
    }



    @Override

    public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {

        view.setTranslationX(0);

    public void setPrimaryAndResetSecondaryTranslate(

            View view, float translation, float defaultTranslationX, float defaultTranslationY) {

        view.setTranslationX(defaultTranslationX);

        view.setTranslationY(translation);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public interface PagedOrientationHandler { 
    int getSecondaryDimension(View view);

    FloatProperty<View> getPrimaryViewTranslate();

    FloatProperty<View> getSecondaryViewTranslate();

    void setPrimaryAndResetSecondaryTranslate(View view, float translation);

    void setPrimaryAndResetSecondaryTranslate(

            View view, float translation, float defaultTranslationX, float defaultTranslationY);

    int getPrimaryScroll(View view);

    float getPrimaryScale(View view);

    int getChildStart(View view);

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

+3 −2
Original line number Diff line number Diff line
@@ -145,9 +145,10 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
    }



    @Override

    public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {

    public void setPrimaryAndResetSecondaryTranslate(

            View view, float translation, float defaultTranslationX, float defaultTranslationY) {

        view.setTranslationX(translation);

        view.setTranslationY(0);

        view.setTranslationY(defaultTranslationY);

    }



    @Override