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

Commit a3ebbbeb authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Update grouped task view thumbnail splash interpolation to match... 

Merge "Update grouped task view thumbnail splash interpolation to match regular task." into tm-qpr-dev
parents a29868e3 038e112e

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

+1 −3
Original line number Diff line number Diff line 
package com.android.quickstep.views;



import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.util.SplitConfigurationOptions.DEFAULT_SPLIT_RATIO;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
@@ -318,7 +317,6 @@ public class GroupedTaskView extends TaskView { 
    @Override

    protected void applyThumbnailSplashAlpha() {

        super.applyThumbnailSplashAlpha();

        mSnapshotView2.setSplashAlpha(

                Utilities.mapToRange(mTaskThumbnailSplashAlpha, 0f, 1f, 1f, 0f, LINEAR));

        mSnapshotView2.setSplashAlpha(mTaskThumbnailSplashAlpha);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ public class TaskView extends FrameLayout implements Reusable { 
    }



    protected void applyThumbnailSplashAlpha() {

        mSnapshotView.setSplashAlpha(Utilities.boundToRange(mTaskThumbnailSplashAlpha, 0f, 1f));

        mSnapshotView.setSplashAlpha(mTaskThumbnailSplashAlpha);

    }



    private void setSplitSelectTranslationX(float x) {