Adding ability to add to hotseat from spring loaded mode (5064141).

- Fixing regression where folder items had no text in tablet ui and assets
- Fixing spring loaded frame sizing (5067335)
- Making the cells 80x80 for testing again on the phone ui (5085986)

Change-Id: I52a0f5eaf2dcf4adaf57c5a71da3903892c490a8

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index cd62ee1..400c881 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2040,6 +2040,7 @@ public final class Launcher extends Activity
 
         // Shrink workspaces away if going to AppsCustomize from workspace
         mWorkspace.shrink(Workspace.State.SMALL, animated);
+        hideHotseat(animated);
 
         if (animated) {
             final ValueAnimator scaleAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration);
@@ -2141,6 +2142,7 @@ public final class Launcher extends Activity
         if (!springLoaded) {
             mWorkspace.unshrink(animated);
         }
+        showHotseat(animated);
         if (animated) {
             if (mStateAnimation != null) mStateAnimation.cancel();
             mStateAnimation = new AnimatorSet();
@@ -2297,7 +2299,6 @@ public final class Launcher extends Activity
 
         // Hide the search bar and hotseat
         mSearchDeleteBar.hideSearchBar(animated);
-        hideHotseat(animated);
 
         // Change the state *after* we've called all the transition code
         mState = State.APPS_CUSTOMIZE;
@@ -2357,7 +2358,6 @@ public final class Launcher extends Activity
 
             // Show the search bar and hotseat
             mSearchDeleteBar.showSearchBar(animated);
-            showHotseat(animated);
 
             // Set focus to the AppsCustomize button
             if (mAllAppsButton != null) {