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

* commit '0553f88a63d7f2deeddfde34aae2933c36df0471':
  Don't animate search bar when we are not animating the transition to workspace. (Bug 11105305)
This commit is contained in:
Winson Chung
2013-10-08 17:28:59 -07:00
committed by Android Git Automerger
+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