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

Commit be767c91 authored by Alex Chau's avatar Alex Chau
Browse files

Don't call TaskView.onRecycle when moving focused task to front 

- onRecycle removes the icon cache resulting on icon disappearing when entering overview
- only call necessary view transform reset in moveFocusedTaskToFront

Bug: 195415765
Test: quick switch, launch app then swipe up
Change-Id: Iadb7287ea307a3a4aa0acce2e37837142aeb90db
parent 0a39f6da

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

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        mMovingTaskView = focusedTaskView;

        removeView(focusedTaskView);

        mMovingTaskView = null;

        focusedTaskView.onRecycle();

        focusedTaskView.resetPersistentViewTransforms();

        addView(focusedTaskView, mTaskViewStartIndex);

        setCurrentPage(mTaskViewStartIndex);

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

+7 −3
Original line number Diff line number Diff line
@@ -871,6 +871,12 @@ public class TaskView extends FrameLayout implements Reusable { 
        setIconAndDimTransitionProgress(iconScale, invert);

    }



    protected void resetPersistentViewTransforms() {

        mNonGridTranslationX = mNonGridTranslationY =

                mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;

        resetViewTransforms();

    }



    protected void resetViewTransforms() {

        // fullscreenTranslation and accumulatedTranslation should not be reset, as

        // resetViewTransforms is called during Quickswitch scrolling.
@@ -894,9 +900,7 @@ public class TaskView extends FrameLayout implements Reusable { 


    @Override

    public void onRecycle() {

        mNonGridTranslationX = mNonGridTranslationY =

                mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;

        resetViewTransforms();

        resetPersistentViewTransforms();

        // Clear any references to the thumbnail (it will be re-read either from the cache or the

        // system on next bind)

        mSnapshotView.setThumbnail(mTask, null);