commit 0553f88a63d7f2deeddfde34aae2933c36df0471
author Winson Chung <winsonc@google.com> Wed Oct 09 00:26:00 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 09 00:26:01 2013 +0000
tree 12fe9866b7658f5180046c336eedf5449cc1e15c
parent 8bcdff50e55a75b34747edb34cb683ad52335b39
parent 04c0a5c9110eff549cb1120341797ec986d9943a

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

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 201e583..5aec399 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3042,7 +3042,7 @@
             // 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