diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-11 20:36:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-11 20:36:46 +0000 |
commit | 9e00b3c503df011bbd86cc86e8349cf4b35070d7 (patch) | |
tree | ddf3a704900471c7abc7415191b5ab6ad4952047 /src/com/android/launcher3/allapps | |
parent | 9968ed09329284da0f0df01d188c788d13c59216 (diff) | |
parent | 2d89ea84530559e2002a3a4009a50bac1e568507 (diff) | |
download | android_packages_apps_Trebuchet-9e00b3c503df011bbd86cc86e8349cf4b35070d7.tar.gz android_packages_apps_Trebuchet-9e00b3c503df011bbd86cc86e8349cf4b35070d7.tar.bz2 android_packages_apps_Trebuchet-9e00b3c503df011bbd86cc86e8349cf4b35070d7.zip |
Merge "Fade in background scrim when resuming from screen off." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java index c71bc3166..54c5bd0b2 100644 --- a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java +++ b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java @@ -25,6 +25,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.view.Gravity; +import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.R; /** @@ -119,7 +120,8 @@ public class AllAppsBackgroundDrawable extends Drawable { int finalAlphaI = (int) (finalAlpha * 255f); if (getAlpha() != finalAlphaI) { mBackgroundAnim = cancelAnimator(mBackgroundAnim); - mBackgroundAnim = ObjectAnimator.ofInt(this, "alpha", finalAlphaI); + mBackgroundAnim = ObjectAnimator.ofInt(this, LauncherAnimUtils.DRAWABLE_ALPHA, + finalAlphaI); mBackgroundAnim.setDuration(duration); mBackgroundAnim.start(); } |