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

Commit e303c5c3 authored by alanv's avatar alanv
Browse files

Send LockPatternView accessibility announcements before callbacks 

This allows the pattern's listener to optionally send accessibility
announcements that interrupt the defaults, rather than the view always
interrupting the listener.

Bug: 7256500
Change-Id: Ief2f5cc2fae76a3becc1321d14d46f97b3092215
parent 031e9d2e

core/java/com/android/internal/widget/LockPatternView.java

+5 −7
Original line number Diff line number Diff line
@@ -375,31 +375,31 @@ public class LockPatternView extends View { 
    }



    private void notifyCellAdded() {

        sendAccessEvent(R.string.lockscreen_access_pattern_cell_added);

        if (mOnPatternListener != null) {

            mOnPatternListener.onPatternCellAdded(mPattern);

        }

        sendAccessEvent(R.string.lockscreen_access_pattern_cell_added);

    }



    private void notifyPatternStarted() {

        sendAccessEvent(R.string.lockscreen_access_pattern_start);

        if (mOnPatternListener != null) {

            mOnPatternListener.onPatternStart();

        }

        sendAccessEvent(R.string.lockscreen_access_pattern_start);

    }



    private void notifyPatternDetected() {

        sendAccessEvent(R.string.lockscreen_access_pattern_detected);

        if (mOnPatternListener != null) {

            mOnPatternListener.onPatternDetected(mPattern);

        }

        sendAccessEvent(R.string.lockscreen_access_pattern_detected);

    }



    private void notifyPatternCleared() {

        sendAccessEvent(R.string.lockscreen_access_pattern_cleared);

        if (mOnPatternListener != null) {

            mOnPatternListener.onPatternCleared();

        }

        sendAccessEvent(R.string.lockscreen_access_pattern_cleared);

    }



    /**
@@ -799,9 +799,7 @@ public class LockPatternView extends View { 
    }



    private void sendAccessEvent(int resId) {

        setContentDescription(mContext.getString(resId));

        sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);

        setContentDescription(null);

        announceForAccessibility(mContext.getString(resId));

    }



    private void handleActionUp(MotionEvent event) {