summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2012-09-21 18:28:48 +0100
committerNarayan Kamath <narayan@google.com>2012-09-21 18:28:48 +0100
commit95a556ac7a6d403bc82a4379071e282e541295f5 (patch)
tree5e4c58ffd69c2a05e12f9761828229d578ddb810 /src
parent804503c75a12e1578f2f71ff3cb32ae912fc9451 (diff)
downloadandroid_packages_apps_Trebuchet-95a556ac7a6d403bc82a4379071e282e541295f5.tar.gz
android_packages_apps_Trebuchet-95a556ac7a6d403bc82a4379071e282e541295f5.tar.bz2
android_packages_apps_Trebuchet-95a556ac7a6d403bc82a4379071e282e541295f5.zip
Remove "fade in" animation for search + voice search.
This applies when the app is launched by tapping the search box or the voice search icon. bug:7193408 Change-Id: I29f41faa20c3e7ad00032f749c99d9b69402c422
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ab361f12f..896c192de 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1648,7 +1648,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;
}
@@ -1961,7 +1960,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);