summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matthew Ng <ngmatthew@google.com> 2019-02-25 15:36:37 -0800
committer Matthew Ng <ngmatthew@google.com> 2019-02-25 15:36:37 -0800
commita3fee34cd2887d9939ded5354ce0210f0cb0b6f1 (patch)
tree81dc25ccb99657dc689d1bb820ad7543adedbac8
parenta2c5d1a7f36c53c06d1df8364e3036ea986855a4 (diff)
Pass all touch events to launcher over keyguard
Also changed the enabled state resolve flags to MATCH_SYSTEM_ONLY for launcher to handle activities over lockscreen. Bug: 125364936 Test: manual Change-Id: Iabe7cd560296c908dc36c66b3cb50ac23b20a12c
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java9
2 files changed, 2 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
index 83c4cfc6c126..0429334d89f6 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
@@ -16,7 +16,7 @@
package com.android.systemui.recents;
-import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
+import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import static android.view.MotionEvent.ACTION_CANCEL;
import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_UP;
@@ -592,7 +592,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
private void updateEnabledState() {
mIsEnabled = mContext.getPackageManager().resolveServiceAsUser(mQuickStepIntent,
- MATCH_DIRECT_BOOT_UNAWARE,
+ MATCH_SYSTEM_ONLY,
ActivityManagerWrapper.getInstance().getCurrentUserId()) != null;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
index 73ab5274a0ab..3398fd34c921 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
@@ -192,10 +192,6 @@ public class QuickStepController implements GestureHelper {
*/
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
- if (mStatusBar.isKeyguardShowing()) {
- // Disallow any handling when the keyguard is showing
- return false;
- }
return handleTouchEvent(event);
}
@@ -205,11 +201,6 @@ public class QuickStepController implements GestureHelper {
*/
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (mStatusBar.isKeyguardShowing()) {
- // Disallow any handling when the keyguard is showing
- return false;
- }
-
// The same down event was just sent on intercept and therefore can be ignored here
final boolean ignoreProxyDownEvent = event.getAction() == MotionEvent.ACTION_DOWN
&& mOverviewEventSender.getProxy() != null