summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2015-06-19 17:00:19 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-06-30 09:41:22 -0700
commitee89d29fb4e52e14411479d5831767f99dc6d4c1 (patch)
treef0eec47fdad828bfee2791e1bd40082bd6683bbe /src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
parente8ae2d7cdf145491d1e32558eee7f062e0dac29c (diff)
downloadpackages_apps_SetupWizard-ee89d29fb4e52e14411479d5831767f99dc6d4c1.zip
packages_apps_SetupWizard-ee89d29fb4e52e14411479d5831767f99dc6d4c1.tar.gz
packages_apps_SetupWizard-ee89d29fb4e52e14411479d5831767f99dc6d4c1.tar.bz2
Clarify touch event consumption logic
* Make it clear that both onInterceptTouchEvent and onTouchEvent need to occur. Change-Id: I951a470ad073f85a9a006c7f440872839d26cd26
Diffstat (limited to 'src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java')
-rw-r--r--src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java6
1 files 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());