From ee89d29fb4e52e14411479d5831767f99dc6d4c1 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Fri, 19 Jun 2015 17:00:19 -0700
Subject: [PATCH] Clarify touch event consumption logic

* Make it clear that both onInterceptTouchEvent and onTouchEvent need to
  occur.

Change-Id: I951a470ad073f85a9a006c7f440872839d26cd26
---
 src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index f37b3f8..afa861a 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -143,9 +143,9 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
         mRootView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                return
-                    mEnableAccessibilityController.onInterceptTouchEvent(event) &
-                    mEnableAccessibilityController.onTouchEvent(event);
+                boolean consumeIntercept = mEnableAccessibilityController.onInterceptTouchEvent(event);
+                boolean consumeTouch = mEnableAccessibilityController.onTouchEvent(event);
+                return consumeIntercept && consumeTouch;
             }
         });
         registerReceiver(mSetupData, mSetupData.getIntentFilter());