SetupWizard: Handle all touch events in EnableAccessibilityController (0fde3a04) · Commits · e / os / android_packages_apps_SetupWizard

src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,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);
		return
		mEnableAccessibilityController.onInterceptTouchEvent(event) &
		mEnableAccessibilityController.onTouchEvent(event);
		}
		});
		registerReceiver(mSetupData, mSetupData.getIntentFilter());

+14 −6

Original line number	Diff line number	Diff line
		@@ -188,8 +188,14 @@ public class EnableAccessibilityController {
		if (pointerCount > 2) {
		cancel();
		}
		} break;
		}
		break;
		case MotionEvent.ACTION_MOVE: {
		//We only care about a 2 fingered move
		if (pointerCount < 2) {
		cancel();
		return false;
		}
		final float firstPointerMove = MathUtils.dist(event.getX(0),
		event.getY(0), mFirstPointerDownX, mFirstPointerDownY);
		if (Math.abs(firstPointerMove) > mTouchSlop) {
		@@ -200,11 +206,13 @@ public class EnableAccessibilityController {
		if (Math.abs(secondPointerMove) > mTouchSlop) {
		cancel();
		}
		} break;
		}
		break;
		case MotionEvent.ACTION_POINTER_UP:
		case MotionEvent.ACTION_CANCEL: {
		cancel();
		} break;
		}
		break;
		}
		return true;
		}