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

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2013-10-09 00:26:01 +00:00
commit 0553f88a63
1 file changed
+1 -1
+1 -1
View File
@@ -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