summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-06-04 23:47:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-04 23:47:35 +0000
commit26c2842f07668385b8f4594848cf6e93502da4a3 (patch)
tree9ba6716d6fa701805d8f6a598f931810e26681b0
parent799aa04f2f961742a2f99bc0dc5a19f6bbbe2f56 (diff)
parent0c9143d06b64ca40c64e66ddd65848deeead8131 (diff)
downloadandroid_packages_apps_Trebuchet-26c2842f07668385b8f4594848cf6e93502da4a3.zip
android_packages_apps_Trebuchet-26c2842f07668385b8f4594848cf6e93502da4a3.tar.gz
android_packages_apps_Trebuchet-26c2842f07668385b8f4594848cf6e93502da4a3.tar.bz2
Merge "Preventing overdraw in custom content screen" into ub-launcher3-burnaby
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 193a0af..d0b9a22 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1620,7 +1620,7 @@ public class Workspace extends PagedView
// We should only update the drag layer background alpha if we are not in all apps or the
// widgets tray
if (mState == State.NORMAL) {
- mLauncher.getDragLayer().setBackgroundAlpha(progress * 0.8f);
+ mLauncher.getDragLayer().setBackgroundAlpha(progress == 1 ? 0 : progress * 0.8f);
}
if (mLauncher.getHotseat() != null) {