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

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

Merge "Add missing overview progress calls, track grid progress for thumbnail... 

Merge "Add missing overview progress calls, track grid progress for thumbnail splash." into tm-qpr-dev
parents 6c057718 d61ccbb7

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

+3 −2
Original line number Diff line number Diff line
@@ -120,8 +120,9 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f,

                showAsGrid ? INSTANT : FINAL_FRAME);



        setter.setFloat(mRecentsView, OVERVIEW_PROGRESS,

                toState == LauncherState.OVERVIEW ? 1f : 0f, INSTANT);

        boolean toOverview = toState == LauncherState.OVERVIEW;

        setter.setFloat(mRecentsView, OVERVIEW_PROGRESS, toOverview ? 1f : 0f,

                toOverview ? INSTANT : FINAL_FRAME);

    }



    abstract FloatProperty getTaskModalnessProperty();

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

+5 −0
Original line number Diff line number Diff line
@@ -2234,6 +2234,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                }

            }

        }

        if (animatorSet == null) {

            setOverviewProgress(1);

        } else {

            animatorSet.play(ObjectAnimator.ofFloat(this, OVERVIEW_PROGRESS, 1));

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class TaskThumbnailView extends View { 
     * Sets the alpha of the splash view.

     */

    public void setSplashAlpha(float splashAlpha) {

        mSplashAlpha = (int) (splashAlpha * 255);

        mSplashAlpha = (int) (Utilities.boundToRange(splashAlpha, 0f, 1f) * 255);

        if (mSplashViewDrawable != null) {

            mSplashViewDrawable.setAlpha(mSplashAlpha);

        }