commit | 8182c7e928ce096814d9f16f2c314eec2df94dad | [log] [tgz] |
---|---|---|
author | Zak Cohen <zakcohen@google.com> | Mon May 03 18:11:02 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 18:11:02 2021 +0000 |
tree | 47d0c7ffccda6117801a0f70db4ec180719ee16e | |
parent | a8217466737644c44f2369262f7691e8a7eeb45c [diff] | |
parent | 554cf58401aa6b9a3265a655f690e762b871a64f [diff] |
Merge "Overview - fade task icon instead of scaling it per new ux" into sc-dev am: 554cf58401 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14390332 Change-Id: I9a15a9e95b8c4db61f96992881d46fb0b89d50d9
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)));