summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-14 16:29:02 -0700
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:23:31 -0800
commita29e71b85dd1999d750922fceba12eee18dbefdd (patch)
tree4c46213426e2222f064c25c2d4d46a8163f84db9
parent540004905a555087e72691aad4479aa52ab5460e (diff)
downloadandroid_packages_apps_Trebuchet-a29e71b85dd1999d750922fceba12eee18dbefdd.tar.gz
android_packages_apps_Trebuchet-a29e71b85dd1999d750922fceba12eee18dbefdd.tar.bz2
android_packages_apps_Trebuchet-a29e71b85dd1999d750922fceba12eee18dbefdd.zip
Fix issue where custom content pops in (issue 11209357)
Change-Id: Ibb40505ac25d59add0b405a1b2ac48a9778314d3
-rw-r--r--src/com/android/launcher3/Workspace.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index da0416235..908a61ea4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1446,6 +1446,12 @@ public class Workspace extends SmoothPagedView
}
if (Float.compare(progress, mLastCustomContentScrollProgress) == 0) return;
+
+ CellLayout cc = mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID);
+ if (progress > 0 && cc.getVisibility() != VISIBLE && !isSmall()) {
+ cc.setVisibility(VISIBLE);
+ }
+
mLastCustomContentScrollProgress = progress;
setBackgroundAlpha(progress * 0.8f);