summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-08-09 17:42:01 -0700
committerAmith Yamasani <yamasani@google.com>2011-08-09 17:54:06 -0700
commita135ba896e4e12a99deb054f671c63535c3e11e3 (patch)
tree5d5bc73022bbfd97ca5d4c984b4628ee2e6d7019 /src
parentcddd8d3cad8136594f4b556ef654c561b31a8ded (diff)
downloadandroid_packages_apps_Trebuchet-a135ba896e4e12a99deb054f671c63535c3e11e3.tar.gz
android_packages_apps_Trebuchet-a135ba896e4e12a99deb054f671c63535c3e11e3.tar.bz2
android_packages_apps_Trebuchet-a135ba896e4e12a99deb054f671c63535c3e11e3.zip
Smooth fade to search activity when hard search key is pressed.
Bug: 5112576 Change-Id: Ia9561de2373a3f71f8fe5acbe495e0d097857618
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1b105d23a..421db74e3 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1213,6 +1213,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;
}
@@ -1538,9 +1540,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();
}
/**