diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-14 17:10:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 17:10:57 +0000 |
| commit | 4e2683a4b582d28bb320308b5e5f3541ae1aa310 (patch) | |
| tree | b30321ae21cc1dd51e4ab9773fd5c4b902d8ce14 | |
| parent | e9b198fd7414771db3df259ce696f0070ea9a153 (diff) | |
| parent | 76128b6359fc430542811fbb32e4a1d593a9ef07 (diff) | |
| download | android_packages_apps_Trebuchet-4e2683a4b582d28bb320308b5e5f3541ae1aa310.tar.gz android_packages_apps_Trebuchet-4e2683a4b582d28bb320308b5e5f3541ae1aa310.tar.bz2 android_packages_apps_Trebuchet-4e2683a4b582d28bb320308b5e5f3541ae1aa310.zip | |
Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 500f2a911..9b6784c8d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2110,7 +2110,8 @@ public class Workspace extends SmoothPagedView if (stateIsSmall) { finalAlpha = 0f; } else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) { - finalAlpha = i == getNextPage() ? 1f : 0f; + + finalAlpha = (i == getNextPage() || i < numCustomPages()) ? 1f : 0f; } else { finalAlpha = 1f; } @@ -2351,6 +2352,11 @@ public class Workspace extends SmoothPagedView final CellLayout cl = (CellLayout) getChildAt(i); cl.setShortcutAndWidgetAlpha(1f); } + } else { + for (int i = 0; i < numCustomPages(); i++) { + final CellLayout cl = (CellLayout) getChildAt(i); + cl.setShortcutAndWidgetAlpha(1f); + } } showCustomContentIfNecessary(); } @@ -4568,6 +4574,7 @@ public class Workspace extends SmoothPagedView child.requestFocus(); } } + exitWidgetResizeMode(); } @Override |