diff options
author | alanv <alanv@google.com> | 2012-10-03 13:15:14 -0700 |
---|---|---|
committer | alanv <alanv@google.com> | 2012-10-03 13:15:14 -0700 |
commit | e303c5c3eb2f65ef3c6fc2693cc3cbcee92d63b7 (patch) | |
tree | 6a2262fcd38a10cfecd18c66724f444c7f2c41b2 /core/java/com | |
parent | 031e9d2e21797fd668404be407dcc625f3b149c1 (diff) | |
download | frameworks_base-e303c5c3eb2f65ef3c6fc2693cc3cbcee92d63b7.zip frameworks_base-e303c5c3eb2f65ef3c6fc2693cc3cbcee92d63b7.tar.gz frameworks_base-e303c5c3eb2f65ef3c6fc2693cc3cbcee92d63b7.tar.bz2 |
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
Diffstat (limited to 'core/java/com')
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternView.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 0d9cf9a..6c5ed7e 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -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) { |