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

Commit 888bc479 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Fix various animation issues when total width of grid tasks < screen... 

Merge "Fix various animation issues when total width of grid tasks < screen width" into tm-qpr-dev am: a8c2ffc1 am: 2248a0e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21549707



Change-Id: I09d435775d10fdd5bae2df06730560444081db02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50164745 2248a0e9

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+1 −4
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ public final class RecentsViewStateController extends 
    private void handleSplitSelectionState(@NonNull LauncherState toState,

            @NonNull PendingAnimation builder, boolean animate) {

        if (toState != OVERVIEW_SPLIT_SELECT) {

            // Not going to split, nothing to do but ensure taskviews are at correct offset

            mRecentsView.resetSplitPrimaryScrollOffset();

            // Not going to split

            return;

        }
@@ -153,8 +152,6 @@ public final class RecentsViewStateController extends 
            as.start();

            as.end();

        }



        mRecentsView.applySplitPrimaryScrollOffset();

    }



    private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+2 −8
Original line number Diff line number Diff line
@@ -130,15 +130,9 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState 
                mRecentsView.getPagedOrientationHandler().getSplitSelectTaskOffset(

                        TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,

                        mActivity.getDeviceProfile());

        setter.setFloat(mRecentsView, taskViewsFloat.first, isSplitSelectionState(state)

                ? mRecentsView.getSplitSelectTranslation() : 0, LINEAR);

        setter.setFloat(mRecentsView, taskViewsFloat.second, 0, LINEAR);

        if (isSplitSelectionState(state)) {

            mRecentsView.applySplitPrimaryScrollOffset();

            setter.setFloat(mRecentsView, taskViewsFloat.first,

                    mRecentsView.getSplitSelectTranslation(), LINEAR);

        } else {

            mRecentsView.resetSplitPrimaryScrollOffset();

            setter.setFloat(mRecentsView, taskViewsFloat.first, 0, LINEAR);

        }

    }



    /**

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

+0 −6
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public class ClearAllButton extends Button { 
    private float mGridTranslationPrimary;

    private float mGridScrollOffset;

    private float mScrollOffsetPrimary;

    private float mSplitSelectScrollOffsetPrimary;



    private int mSidePadding;
@@ -176,10 +175,6 @@ public class ClearAllButton extends Button { 
        mScrollOffsetPrimary = scrollOffsetPrimary;

    }



    public void setSplitSelectScrollOffsetPrimary(float splitSelectScrollOffsetPrimary) {

        mSplitSelectScrollOffsetPrimary = splitSelectScrollOffsetPrimary;

    }



    public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {

        float scrollAdjustment = 0;

        if (fullscreenEnabled) {
@@ -189,7 +184,6 @@ public class ClearAllButton extends Button { 
            scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset;

        }

        scrollAdjustment += mScrollOffsetPrimary;

        scrollAdjustment += mSplitSelectScrollOffsetPrimary;

        return scrollAdjustment;

    }