summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-14 16:29:02 -0700
committerAdam Cohen <adamcohen@google.com>2013-10-14 16:42:10 -0700
commit84add1de6d0964d675542af2a70f7f67e5da556a (patch)
tree4449c43725f4aac7e0412caf23eace8f9c528322 /src
parent2ac85a6d3e1096b50f00f4236ae059bcdaecb761 (diff)
downloadandroid_packages_apps_Trebuchet-84add1de6d0964d675542af2a70f7f67e5da556a.tar.gz
android_packages_apps_Trebuchet-84add1de6d0964d675542af2a70f7f67e5da556a.tar.bz2
android_packages_apps_Trebuchet-84add1de6d0964d675542af2a70f7f67e5da556a.zip
Fix issue where custom content pops in (issue 11209357)
Change-Id: Ibb40505ac25d59add0b405a1b2ac48a9778314d3
Diffstat (limited to 'src')
-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);