diff options
author | Winson Chung <winsonc@google.com> | 2011-07-27 17:46:20 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-29 11:34:23 -0700 |
commit | 4afe9b31f51022538b30646fe83780e83bf22490 (patch) | |
tree | 24d7c49cb86a062f7a430166a3f7416565896ee8 /src/com/android/launcher2/Launcher.java | |
parent | fec9786f2e7171f6616b8258a8dee8be2d5f1fd4 (diff) | |
download | packages_apps_trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.zip packages_apps_trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.tar.gz packages_apps_trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.tar.bz2 |
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
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
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) { |