PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where can't interact with Workspace while App => Home is running" into ub-launcher3-qt-r1-dev

Browse Source
This commit is contained in:
Adam Cohen
2019-07-10 04:02:47 +00:00
committed by Android (Google) Code Review
parent 4610ce4019 ab6be31746
commit 315585d654
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+5
View File
@@ -472,6 +472,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
}
}
@Override
protected boolean shouldBlockGestures(MotionEvent ev) {
return Utilities.shouldDisableGestures(ev);
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
super.onTouchEvent(ev);
src/com/android/launcher3/PagedView.java
+6 -3
View File
@@ -16,7 +16,6 @@
package com.android.launcher3;
import static com.android.launcher3.Utilities.shouldDisableGestures;
import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
@@ -847,7 +846,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
*/
// Skip touch handling if there are no pages to swipe
if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;
if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;
acquireVelocityTrackerAndAddMovement(ev);
@@ -1092,10 +1091,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
mAllowOverScroll = enable;
}
protected boolean shouldBlockGestures(MotionEvent ev) {
return false;
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
// Skip touch handling if there are no pages to swipe
if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;
if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;
acquireVelocityTrackerAndAddMovement(ev);