Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send LockPatternView accessibility announcements before callbacks" into jb-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-10-03 13:32:34 -07:00
committed by Android (Google) Code Review
parent 7636693824 e303c5c3eb
commit 26884df75c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/LockPatternView.java
View File

@@ -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) {