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

Commit 64b80cb7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Animate right icon of app pair" into sc-v2-dev am: 2bede2db 

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

Change-Id: Ib04df010c9da0d8c435c1f97ac5cd113de86a73e
parents 8c427dd7 2bede2db

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

+6 −0
Original line number Diff line number Diff line
@@ -258,4 +258,10 @@ public class GroupedTaskView extends TaskView { 
        super.updateSnapshotRadius();

        mSnapshotView2.setFullscreenParams(mCurrentFullscreenParams);

    }



    @Override

    protected void setIconAndDimTransitionProgress(float progress, boolean invert) {

        super.setIconAndDimTransitionProgress(progress, invert);

        mIconView2.setAlpha(mIconView.getAlpha());

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ public class TaskView extends FrameLayout implements Reusable { 
        return deviceProfile.overviewShowAsGrid && !isFocusedTask();

    }



    private void setIconAndDimTransitionProgress(float progress, boolean invert) {

    protected void setIconAndDimTransitionProgress(float progress, boolean invert) {

        if (invert) {

            progress = 1 - progress;

        }