summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorMatthew Ng <ngmatthew@google.com>2018-06-25 15:32:24 -0700
committerMatthew Ng <ngmatthew@google.com>2018-07-17 11:21:23 -0700
commiteb9cc9dbd5d173ed55f97105bb2dda9daaaf7c7d (patch)
tree35ee0cbee1dc0eac8a6350fd953b58e0f05af28d /src/com/android/launcher3
parent1f8cbcf1c665c77929abe9e00833c0dfb093f0f7 (diff)
downloadandroid_packages_apps_Trebuchet-eb9cc9dbd5d173ed55f97105bb2dda9daaaf7c7d.tar.gz
android_packages_apps_Trebuchet-eb9cc9dbd5d173ed55f97105bb2dda9daaaf7c7d.tar.bz2
android_packages_apps_Trebuchet-eb9cc9dbd5d173ed55f97105bb2dda9daaaf7c7d.zip
Animate the long press icon scale for task menu to match task view
Use scale listeners to track each other's icon scale to match them. Test: go to recents and long press icon Fixes: 110789415 Change-Id: I9bba3130ecf1d099db9708c84e709d16f5906c36
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/FastBitmapDrawable.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 9217ca987..7efb6ec94 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -109,7 +109,7 @@ public class FastBitmapDrawable extends Drawable {
@Override
public final void draw(Canvas canvas) {
- if (mScaleAnimation != null) {
+ if (mScale != 1f) {
int count = canvas.save();
Rect bounds = getBounds();
canvas.scale(mScale, mScale, bounds.exactCenterX(), bounds.exactCenterY());
@@ -150,10 +150,23 @@ public class FastBitmapDrawable extends Drawable {
return mAlpha;
}
+ public void setScale(float scale) {
+ if (mScaleAnimation != null) {
+ mScaleAnimation.cancel();
+ mScaleAnimation = null;
+ }
+ mScale = scale;
+ invalidateSelf();
+ }
+
public float getAnimatedScale() {
return mScaleAnimation == null ? 1 : mScale;
}
+ public float getScale() {
+ return mScale;
+ }
+
@Override
public int getIntrinsicWidth() {
return mBitmap.getWidth();