Merge "Pass all touch events to launcher over keyguard" (4433d0ba) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -629,7 +629,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;
		}

+0 −9

Original line number	Diff line number	Diff line
		@@ -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