summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-10-05 14:42:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-05 14:42:35 -0700
commit79c576457e9fecb13e8ef514575e55a1aa051d87 (patch)
tree41ba9e847b29334bc4489bf8afdaeccf42077623 /src
parent9c4949e12c909d5e01d24386147b1c528015b31b (diff)
parent5617056f9b339c3abe03767c2c9dfcf6767f87ad (diff)
downloadandroid_packages_apps_Trebuchet-79c576457e9fecb13e8ef514575e55a1aa051d87.tar.gz
android_packages_apps_Trebuchet-79c576457e9fecb13e8ef514575e55a1aa051d87.tar.bz2
android_packages_apps_Trebuchet-79c576457e9fecb13e8ef514575e55a1aa051d87.zip
Merge "Long press on Launcher background no longer brings up customization tray on XLarge devices"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ad3777944..85088f80a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1945,12 +1945,7 @@ public final class Launcher extends Activity
mWorkspace.setAllowLongPress(false);
mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
- if (LauncherApplication.isScreenXLarge()) {
- // Animate the widget chooser up from the bottom of the screen
- if (!isCustomizationDrawerVisible()) {
- showCustomizationDrawer(true);
- }
- } else {
+ if (!LauncherApplication.isScreenXLarge()) {
showAddDialog(longClickCellInfo.cellX, longClickCellInfo.cellY);
}
} else {