diff options
author | Mario Bertschler <bmario@google.com> | 2017-06-22 09:27:05 -0700 |
---|---|---|
committer | Mario Bertschler <bmario@google.com> | 2017-06-22 09:29:46 -0700 |
commit | cd04c89f89dd092d34d149dad107efd7ae00fb2a (patch) | |
tree | c92b42758c725ca6e9c08c48d7876dfdead35e90 /src/com/android | |
parent | bef710114c04cac2708f51ab93cf05174b410cab (diff) | |
download | android_packages_apps_Trebuchet-cd04c89f89dd092d34d149dad107efd7ae00fb2a.tar.gz android_packages_apps_Trebuchet-cd04c89f89dd092d34d149dad107efd7ae00fb2a.tar.bz2 android_packages_apps_Trebuchet-cd04c89f89dd092d34d149dad107efd7ae00fb2a.zip |
Removing view.isInTouchMode() because plaform returns false when
using a mouse on long click.
Bug: 38204847
Change-Id: I5b10e8251f4f0a7b148c0404d5939a0fa8325a46
Diffstat (limited to 'src/com/android')
5 files changed, 2 insertions, 15 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index b955fe1b5..517073aca 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2098,11 +2098,6 @@ public class Workspace extends PagedView public void startDrag(CellLayout.CellInfo cellInfo, DragOptions options) { View child = cellInfo.cell; - // Make sure the drag was started by a long press as opposed to a long click. - if (!child.isInTouchMode()) { - return; - } - mDragInfo = cellInfo; child.setVisibility(INVISIBLE); diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 051c1612d..4954e0c44 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -299,10 +299,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc @Override public boolean onLongClick(final View v) { - // Return early if this is not initiated from a touch - if (!v.isInTouchMode()) return false; // When we have exited all apps or are in transition, disregard long clicks - if (!mLauncher.isAppsViewVisible() || mLauncher.getWorkspace().isSwitchingState()) return false; // Return if global dragging is not enabled or we are already dragging diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index b9632fba3..aad8123a9 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -283,9 +283,6 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC Object tag = v.getTag(); if (tag instanceof ShortcutInfo) { ShortcutInfo item = (ShortcutInfo) tag; - if (!v.isInTouchMode()) { - return false; - } mEmptyCellRank = item.rank; mCurrentDragView = v; diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index 59a0386bb..8785a56f9 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -104,8 +104,8 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick @Override public boolean onLongClick(View v) { - // Return early if this is not initiated from a touch or not the correct view - if (!v.isInTouchMode() || !(v.getParent() instanceof DeepShortcutView)) return false; + // Return early if not the correct view + if (!(v.getParent() instanceof DeepShortcutView)) return false; // Return early if global dragging is not enabled if (!mLauncher.isDraggingEnabled()) return false; // Return early if an item is already being dragged (e.g. when long-pressing two shortcuts) diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index 4e296bf41..14a9d17ed 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -139,8 +139,6 @@ public class WidgetsContainerView extends BaseContainerView if (LOGD) { Log.d(TAG, String.format("onLongClick [v=%s]", v)); } - // Return early if this is not initiated from a touch - if (!v.isInTouchMode()) return false; // When we are in transition, disregard long clicks if (mLauncher.getWorkspace().isSwitchingState()) return false; // Return if global dragging is not enabled |