Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d9926b authored by Gabriele M's avatar Gabriele M
Browse files

SetupWizard: Fix the accessibility services gesture 

Returning false from onInterceptTouchEvent() or onTouchEvent() causes
getPointerCount() to never be greater than 1, therefore enabling the
accessibility services is currently impossible. Fix this and simplify
the code merging onInterceptTouchEvent() into onTouchEvent().

Change-Id: Ieadbb41f9f3f3fb62d11f5a29986630d35e7e8c4
parent 77ef7901

src/com/cyanogenmod/setupwizard/WelcomeActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ public class WelcomeActivity extends BaseSetupWizardActivity { 
        mRootView.setOnTouchListener(new View.OnTouchListener() {

            @Override

            public boolean onTouch(View v, MotionEvent event) {

                boolean consumeIntercept = mEnableAccessibilityController.onInterceptTouchEvent(event);

                boolean consumeTouch = mEnableAccessibilityController.onTouchEvent(event);

                return consumeIntercept && consumeTouch;

                return mEnableAccessibilityController.onTouchEvent(event);

            }

        });

    }

src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java

+14 −30
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ public class EnableAccessibilityController { 
    private final float mTouchSlop;



    private boolean mDestroyed;

    private boolean mCanceled;



    private float mFirstPointerDownX;

    private float mFirstPointerDownY;
@@ -157,9 +156,18 @@ public class EnableAccessibilityController { 
        mDestroyed = true;

    }



    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (event.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN

                && event.getPointerCount() == 2) {

    public boolean onTouchEvent(MotionEvent event) {

        final int pointerCount = event.getPointerCount();

        final int action = event.getActionMasked();



        if (pointerCount != 2) {

            cancel();

            return true;

        }



        switch (action) {

            case MotionEvent.ACTION_DOWN:

            case MotionEvent.ACTION_POINTER_DOWN: {

                mFirstPointerDownX = event.getX(0);

                mFirstPointerDownY = event.getY(0);

                mSecondPointerDownX = event.getX(1);
@@ -168,33 +176,9 @@ public class EnableAccessibilityController { 
                        SPEAK_WARNING_DELAY_MILLIS);

                mHandler.sendEmptyMessageDelayed(MESSAGE_ENABLE_ACCESSIBILITY,

                        ENABLE_ACCESSIBILITY_DELAY_MILLIS);

            return true;

        }

        return false;

    }



    public boolean onTouchEvent(MotionEvent event) {

        final int pointerCount = event.getPointerCount();

        final int action = event.getActionMasked();

        if (mCanceled) {

            if (action == MotionEvent.ACTION_UP) {

                mCanceled = false;

            }

            return true;

        }

        switch (action) {

            case MotionEvent.ACTION_POINTER_DOWN: {

                if (pointerCount > 2) {

                    cancel();

                }

            }

            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) {
@@ -207,6 +191,7 @@ public class EnableAccessibilityController { 
                }

            }

            break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_POINTER_UP:

            case MotionEvent.ACTION_CANCEL: {

                cancel();
@@ -217,7 +202,6 @@ public class EnableAccessibilityController { 
    }



    private void cancel() {

        mCanceled = true;

        if (mHandler.hasMessages(MESSAGE_SPEAK_WARNING)) {

            mHandler.removeMessages(MESSAGE_SPEAK_WARNING);

        } else if (mHandler.hasMessages(MESSAGE_ENABLE_ACCESSIBILITY)) {