Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index f519329..817eb41 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -372,14 +372,6 @@
setDragSlopeThreshold(r.getInteger(R.integer.config_appsCustomizeDragSlopeThreshold)/100f);
}
- @Override
- protected void onUnhandledTap(MotionEvent ev) {
- if (LauncherApplication.isScreenLarge()) {
- // Dismiss AppsCustomize if we tap
- mLauncher.showWorkspace(true);
- }
- }
-
/** Returns the item index of the center item on this page so that we can restore to this
* item index when we rotate. */
private int getMiddleComponentIndexOnCurrentPage() {
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);