Merge "Don't animate search bar when we are not animating the transition to workspace. (Bug 11105305)" into jb-ub-now-indigo-rose

2013-10-09 00:26:00 +00:00
parent 8bcdff50e5 04c0a5c911
commit 0553f88a63
1 changed files with 1 additions and 1 deletions
@@ -3042,7 +3042,7 @@ public class Launcher extends Activity
            // Show the search bar (only animate if we were showing the drop target bar in spring
            // loaded mode)
            if (mSearchDropTargetBar != null) {
-                mSearchDropTargetBar.showSearchBar(wasInSpringLoadedMode);
+                mSearchDropTargetBar.showSearchBar(animated && wasInSpringLoadedMode);
            }

            // Set focus to the AppsCustomize button