am 3501c173: am c4a9233a: Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev

* commit '3501c173e4e2f167f0a7336645526ef54799a8f2':
  Remove "fade in" animation for search + voice search.
This commit is contained in:
Michael Jurka
2012-09-21 12:47:02 -07:00
committed by Android Git Automerger
-2
View File
@@ -1651,7 +1651,6 @@ public final class Launcher extends Activity
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 @@ 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);