diff options
| author | Tony Wickham <twickham@google.com> | 2016-03-22 16:20:53 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-03-23 10:42:02 -0700 |
| commit | 9c43182ff1d095b1bbaacedefe6e0f4c2deb17e3 (patch) | |
| tree | 1c39593ab9cc8d24373b568b18018c2396f27f44 /src/com/android/launcher3/dragndrop | |
| parent | d5bd67dfa9ee5fda2384a75231b7a68ceb8e9bd5 (diff) | |
| download | android_packages_apps_Trebuchet-9c43182ff1d095b1bbaacedefe6e0f4c2deb17e3.tar.gz android_packages_apps_Trebuchet-9c43182ff1d095b1bbaacedefe6e0f4c2deb17e3.tar.bz2 android_packages_apps_Trebuchet-9c43182ff1d095b1bbaacedefe6e0f4c2deb17e3.zip | |
Add FeatureFlags.LAUNCHER3_DISABLE_PINCH_TO_OVERVIEW
Bug: 27796974
Change-Id: Icda33fb62783cc3f7b510d627d1eeb9cf29bd2d3
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 40b9179ea..58f98bfaa 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -56,6 +56,7 @@ import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.util.Thunk; @@ -115,7 +116,7 @@ public class DragLayer extends InsettableFrameLayout { private Drawable mRightHoverDrawableActive; // Related to pinch-to-go-to-overview gesture. - private PinchToOverviewListener mPinchListener; + private PinchToOverviewListener mPinchListener = null; /** * Used to create a new DragLayer from XML. * @@ -141,7 +142,9 @@ public class DragLayer extends InsettableFrameLayout { mLauncher = launcher; mDragController = controller; - mPinchListener = new PinchToOverviewListener(mLauncher); + if (!FeatureFlags.LAUNCHER3_DISABLE_PINCH_TO_OVERVIEW) { + mPinchListener = new PinchToOverviewListener(mLauncher); + } } @Override @@ -250,7 +253,7 @@ public class DragLayer extends InsettableFrameLayout { } clearAllResizeFrames(); - if (mPinchListener.onInterceptTouchEvent(ev)) { + if (mPinchListener != null && mPinchListener.onInterceptTouchEvent(ev)) { // Stop listening for scrolling etc. (onTouchEvent() handles the rest of the pinch.) return true; } @@ -369,7 +372,9 @@ public class DragLayer extends InsettableFrameLayout { // This is only reached if a pinch was started from onInterceptTouchEvent(); // this continues sending events for it. - mPinchListener.onTouchEvent(ev); + if (mPinchListener != null) { + mPinchListener.onTouchEvent(ev); + } if (action == MotionEvent.ACTION_DOWN) { if (handleTouchDown(ev, false)) { |