diff options
author | Adam Cohen <adamcohen@google.com> | 2013-11-14 16:43:59 +0000 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 00:48:27 -0700 |
commit | 32f1110ae23676000fa3ef59df8b03213a2ece6a (patch) | |
tree | d8ab3be3e2c2409882d2ff9cf1a36d091eb2c234 /src/com/android/launcher3/Workspace.java | |
parent | 10279d82522a6609934c9f2ba4c67cf7c3b07485 (diff) | |
download | android_packages_apps_Trebuchet-32f1110ae23676000fa3ef59df8b03213a2ece6a.tar.gz android_packages_apps_Trebuchet-32f1110ae23676000fa3ef59df8b03213a2ece6a.tar.bz2 android_packages_apps_Trebuchet-32f1110ae23676000fa3ef59df8b03213a2ece6a.zip |
Fix issue where custom content would be invisible (issue 11644432)
-> Also making sure to clear the widget frame when moving to custom
content.
Change-Id: I460c707f1b6ec34bc6d78c9df43a613d9bfced3c
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-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 9c3fcecab..7d83fde2a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2235,7 +2235,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; } @@ -2504,6 +2505,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(); } @@ -4718,6 +4724,7 @@ public class Workspace extends SmoothPagedView child.requestFocus(); } } + exitWidgetResizeMode(); } @Override |