openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix issue where can't interact with Workspace while App => Home is running 

=> Regression from recent CL ag/8074890
=> Fix which scopes the change down to the RecentsView, but not all PagedViews

Bug 136733573

Change-Id: I0abaa61b2b132d8086dc3b2cb3e3e9c1f181b5f5
This commit is contained in:
Adam Cohen 2019-07-06 13:24:59 +09:00
parent 70697e48a8
commit ab6be31746
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
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 @Override
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
super.onTouchEvent(ev); super.onTouchEvent(ev);

9
src/com/android/launcher3/PagedView.java
View File

@ -16,7 +16,6 @@
package com.android.launcher3; 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.isAccessibilityEnabled;
import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType; import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; 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 // 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); acquireVelocityTrackerAndAddMovement(ev);
@ -1092,10 +1091,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
mAllowOverScroll = enable; mAllowOverScroll = enable;
} }
protected boolean shouldBlockGestures(MotionEvent ev) {
return false;
}
@Override @Override
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
// Skip touch handling if there are no pages to swipe // 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); acquireVelocityTrackerAndAddMovement(ev);