commit c4a9233a94ef186baa8113ceb44b08c65725ed41
author Michael Jurka <mikejurka@google.com> Fri Sep 21 10:51:32 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 21 10:51:32 2012 -0700
tree f4b3e0b1cbd8b592a316b9bc03443919ae03e5db
parent bdb1030e215f163440b6f73f65b0ae47c5f6c8fd
parent 95a556ac7a6d403bc82a4379071e282e541295f5

Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7c52ae6..8c73c29 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1651,7 +1651,6 @@
     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;
     }
 
@@ -1964,7 +1963,6 @@
                 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);