commit 146eef2808de1ab5767e0a089a0e859010107f34
author Amith Yamasani <yamasani@google.com> Tue Aug 09 17:58:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 09 17:58:05 2011 -0700
tree ed837b28b6f7fd19192254454f27e0d6e763fb74
parent da310680c5729710d9ee4d0d2d7c1c1117060ad8
parent a135ba896e4e12a99deb054f671c63535c3e11e3

Merge "Smooth fade to search activity when hard search key is pressed."

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 414cf28..f8e3e1c 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1214,6 +1214,8 @@
     @Override
     public boolean onSearchRequested() {
         startSearch(null, false, null, true);
+        // Use a custom animation for launching search
+        overridePendingTransition(R.anim.fade_in_fast, R.anim.fade_out_fast);
         return true;
     }
 
@@ -1539,9 +1541,7 @@
      * @param v The view that was clicked.
      */
     public void onClickSearchButton(View v) {
-        startSearch(null, false, null, true);
-        // Use a custom animation for launching search
-        overridePendingTransition(R.anim.fade_in_fast, R.anim.fade_out_fast);
+        onSearchRequested();
     }
 
     /**