diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-08-09 17:58:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 17:58:05 -0700 |
| commit | 146eef2808de1ab5767e0a089a0e859010107f34 (patch) | |
| tree | ed837b28b6f7fd19192254454f27e0d6e763fb74 /src | |
| parent | da310680c5729710d9ee4d0d2d7c1c1117060ad8 (diff) | |
| parent | a135ba896e4e12a99deb054f671c63535c3e11e3 (diff) | |
| download | android_packages_apps_Trebuchet-146eef2808de1ab5767e0a089a0e859010107f34.tar.gz android_packages_apps_Trebuchet-146eef2808de1ab5767e0a089a0e859010107f34.tar.bz2 android_packages_apps_Trebuchet-146eef2808de1ab5767e0a089a0e859010107f34.zip | |
Merge "Smooth fade to search activity when hard search key is pressed."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 414cf282b..f8e3e1c29 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1214,6 +1214,8 @@ public final class Launcher extends Activity @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 @@ public final class Launcher extends Activity * @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(); } /** |