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

This commit is contained in:
Pat Manning
2022-07-16 19:38:59 +00:00
committed by Android (Google) Code Review
3 changed files with 9 additions and 3 deletions

View File

@@ -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();

View File

@@ -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));
}
}
/**

View File

@@ -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);
}