diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-14 16:45:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-14 16:45:42 -0700 |
| commit | 6bef14bb4c4c54728cd9da63ca33ce84a900bc22 (patch) | |
| tree | 513bc4a580b02811c0f8220c9756463aa1ba2442 | |
| parent | 3eb3b27a58c958aab0b284683d9858e742287efe (diff) | |
| parent | 2456b9738803b5f4314b6747dd7eea116d03eb3d (diff) | |
| download | android_packages_apps_Trebuchet-6bef14bb4c4c54728cd9da63ca33ce84a900bc22.tar.gz android_packages_apps_Trebuchet-6bef14bb4c4c54728cd9da63ca33ce84a900bc22.tar.bz2 android_packages_apps_Trebuchet-6bef14bb4c4c54728cd9da63ca33ce84a900bc22.zip | |
am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose
* commit '2456b9738803b5f4314b6747dd7eea116d03eb3d':
Fix issue where custom content pops in (issue 11209357)
| -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); |