commit | fd35e9afbb0b4e621c7c9ce4df590a787bea04a3 | [log] [tgz] |
---|---|---|
author | Zak Cohen <zakcohen@google.com> | Mon May 03 18:34:00 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 18:34:00 2021 +0000 |
tree | 47d0c7ffccda6117801a0f70db4ec180719ee16e | |
parent | b2d95075bd1aebad98901023234cf13026bd5622 [diff] | |
parent | f22c9e87af11923ef141b1edad9133473495c082 [diff] |
Merge "Overview - fade task icon instead of scaling it per new ux" into sc-dev am: 554cf58401 am: f22c9e87af Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14390332 Change-Id: I1722c5f815f72135b2c3816c74d7f04c5242a41c
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 3349b74..45bcdc3 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -777,8 +777,7 @@ float upperClamp = invert ? 1 : iconScalePercentage; float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, lowerClamp, upperClamp) .getInterpolation(progress); - mIconView.setScaleX(scale); - mIconView.setScaleY(scale); + mIconView.setAlpha(scale); if (mContextualChipWrapper != null && mContextualChipWrapper != null) { mContextualChipWrapper.setAlpha(scale); mContextualChipWrapper.setScaleX(Math.min(scale, comp(mModalness)));