commit 76128b6359fc430542811fbb32e4a1d593a9ef07
author Adam Cohen <adamcohen@google.com> Thu Nov 14 16:43:59 2013 +0000
committer Adam Cohen <adamcohen@google.com> Thu Nov 14 16:48:08 2013 +0000
tree 7067783e55df5654e8a2c579296435d583fd0551
parent c76e1dda0875c13131462d80d0c1721a6149e08d

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

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 500f2a9..9b6784c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2110,7 +2110,8 @@
             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 @@
                 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 @@
                 child.requestFocus();
             }
          }
+        exitWidgetResizeMode();
     }
 
     @Override