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

Commit f13a51c4 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Inline TaskView#resetVisualProperties() into RecentsView" into ub-launcher3-rvc-dev

parents 5c33e250 d2fffa6e

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

+3 −1
Original line number Diff line number Diff line
@@ -798,8 +798,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        for (int i = getTaskViewCount() - 1; i >= 0; i--) {

            TaskView taskView = getTaskViewAt(i);

            if (mIgnoreResetTaskId != taskView.getTask().key.id) {

                taskView.resetVisualProperties();

                taskView.resetViewTransforms();

                taskView.setStableAlpha(mContentAlpha);

                taskView.setFullscreenProgress(mFullscreenProgress);

                taskView.setModalness(mTaskModalness);

            }

        }

        if (mRunningTaskTileHidden) {

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

+1 −7
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        setIconAndDimTransitionProgress(iconScale, invert);

    }



    private void resetViewTransforms() {

    protected void resetViewTransforms() {

        setCurveScale(1);

        setTranslationX(0f);

        setTranslationY(0f);
@@ -554,12 +554,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        setIconScaleAndDim(1);

    }



    public void resetVisualProperties() {

        resetViewTransforms();

        setFullscreenProgress(0);

        setModalness(0);

    }



    public void setStableAlpha(float parentAlpha) {

        mStableAlpha = parentAlpha;

        setAlpha(mStableAlpha);