summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-22 13:16:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-22 13:16:55 -0700
commit4dd738192b9da9313840fd82962d933c36d5b84b (patch)
treebeb0f2086f27b57e3d8737ecb61b7f3cd5efb3cb
parent389a4eeb187fdbc5fd1f7caf5dff90f8a6e1d37a (diff)
parentf9c3679dc1492b8d97c6cc0aa15f3dfda7439bf3 (diff)
downloadandroid_packages_apps_Trebuchet-4dd738192b9da9313840fd82962d933c36d5b84b.zip
android_packages_apps_Trebuchet-4dd738192b9da9313840fd82962d933c36d5b84b.tar.gz
android_packages_apps_Trebuchet-4dd738192b9da9313840fd82962d933c36d5b84b.tar.bz2
am f9c3679d: Merge "Adding fade in for voice search. (Bug 6534640)" into jb-dev
* commit 'f9c3679dc1492b8d97c6cc0aa15f3dfda7439bf3': Adding fade in for voice search. (Bug 6534640)
-rw-r--r--src/com/android/launcher2/Launcher.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index e6c25cb..f5624e0 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1869,6 +1869,7 @@ public final class Launcher extends Activity
intent.setPackage(activityName.getPackageName());
}
startActivity(null, intent, "onClickVoiceButton");
+ overridePendingTransition(R.anim.fade_in_fast, R.anim.fade_out_fast);
} catch (ActivityNotFoundException e) {
Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK