diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-09-21 10:51:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 10:51:32 -0700 |
| commit | c4a9233a94ef186baa8113ceb44b08c65725ed41 (patch) | |
| tree | f4b3e0b1cbd8b592a316b9bc03443919ae03e5db /src | |
| parent | bdb1030e215f163440b6f73f65b0ae47c5f6c8fd (diff) | |
| parent | 95a556ac7a6d403bc82a4379071e282e541295f5 (diff) | |
| download | android_packages_apps_Trebuchet-c4a9233a94ef186baa8113ceb44b08c65725ed41.tar.gz android_packages_apps_Trebuchet-c4a9233a94ef186baa8113ceb44b08c65725ed41.tar.bz2 android_packages_apps_Trebuchet-c4a9233a94ef186baa8113ceb44b08c65725ed41.zip | |
Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 7c52ae667..8c73c2949 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -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); |