Merge "Adding some assets / fixing a couple bugs" into jb-ub-now-indigo-rose

1 files changed, 24 insertions, 10 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 596ac1113..c0b2ae390 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1950,7 +1950,8 @@ public class Workspace extends SmoothPagedView
                 AlphaUpdateListener.updateVisibility(getPageIndicator());
             }
             searchBar.setAlpha(finalSearchBarAlpha);
-            AlphaUpdateListener.updateVisibility(mLauncher.getSearchBar());
+            AlphaUpdateListener.updateVisibility(searchBar);
+            updateCustomContentVisibility();
         }
         if (finalSearchBarAlpha == 0) {
             mLauncher.setVoiceButtonProxyVisible(false);
@@ -2017,10 +2018,27 @@ public class Workspace extends SmoothPagedView
     private void onTransitionPrepare() {
         mIsSwitchingState = true;
         updateChildrenLayersEnabled(false);
-        if (mState != Workspace.State.NORMAL) {
-            if (hasCustomContent()) {
-                mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
-            }
+        hideCustomContentIfNecessary();
+    }
+
+    void updateCustomContentVisibility() {
+        int visibility = mState == Workspace.State.NORMAL ? VISIBLE : INVISIBLE;
+        if (hasCustomContent()) {
+            mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(visibility);
+        }
+    }
+
+    void showCustomContentIfNecessary() {
+        boolean show  = mState == Workspace.State.NORMAL;
+        if (show && hasCustomContent()) {
+            mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
+        }
+    }
+
+    void hideCustomContentIfNecessary() {
+        boolean hide  = mState != Workspace.State.NORMAL;
+        if (hide && hasCustomContent()) {
+            mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
         }
     }
 
@@ -2037,11 +2055,7 @@ public class Workspace extends SmoothPagedView
                 cl.setShortcutAndWidgetAlpha(1f);
             }
         }
-        if (mState == Workspace.State.NORMAL) {
-            if (hasCustomContent()) {
-                mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
-            }
-        }
+        showCustomContentIfNecessary();
     }
 
     @Override