diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-07 17:19:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 17:19:37 +0000 |
| commit | 067e5e0177a4429e8833b2fd96725eb92e48ab8a (patch) | |
| tree | 9c3ee8ae702bbe725ca870f69783958886dc5537 /src/com/android/launcher3/Launcher.java | |
| parent | 8a8f03d10a0a55e602c5cbf3c2c7035d2270ab47 (diff) | |
| parent | 8e2133b2c2bde86f913d817942bafdcf6818470b (diff) | |
| download | android_packages_apps_Trebuchet-067e5e0177a4429e8833b2fd96725eb92e48ab8a.tar.gz android_packages_apps_Trebuchet-067e5e0177a4429e8833b2fd96725eb92e48ab8a.tar.bz2 android_packages_apps_Trebuchet-067e5e0177a4429e8833b2fd96725eb92e48ab8a.zip | |
Merge "Removing some dead code in paged view" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c0f09f486..1de383c65 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3231,8 +3231,7 @@ public class Launcher extends Activity // The hotseat touch handling does not go through Workspace, and we always allow long press // on hotseat items. final boolean inHotseat = isHotseatLayout(v); - boolean allowLongPress = inHotseat || mWorkspace.allowLongPress(); - if (allowLongPress && !mDragController.isDragging()) { + if (!mDragController.isDragging()) { if (itemUnderLongClick == null) { // User long pressed on empty space mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, |