diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-14 23:43:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 23:43:11 +0000 |
| commit | 2456b9738803b5f4314b6747dd7eea116d03eb3d (patch) | |
| tree | 4c46213426e2222f064c25c2d4d46a8163f84db9 /src | |
| parent | 540004905a555087e72691aad4479aa52ab5460e (diff) | |
| parent | 84add1de6d0964d675542af2a70f7f67e5da556a (diff) | |
| download | android_packages_apps_Trebuchet-2456b9738803b5f4314b6747dd7eea116d03eb3d.tar.gz android_packages_apps_Trebuchet-2456b9738803b5f4314b6747dd7eea116d03eb3d.tar.bz2 android_packages_apps_Trebuchet-2456b9738803b5f4314b6747dd7eea116d03eb3d.zip | |
Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
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); |