diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-04-25 21:49:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-25 21:49:00 +0000 |
| commit | c38bc5ab6b55804c7a8d440cf2bf249baa2efc98 (patch) | |
| tree | 6b054d3f1a3c72b04e222f82b4462275bbe6dad4 /core/java | |
| parent | 99ba72039d9d97ea3ed7d01b327b98c87051e989 (diff) | |
| parent | 4293e233dce185e2b8163b23efa8c17ec3266a87 (diff) | |
Merge "Lockscreen widgets not always announced." into jb-mr2-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/View.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7259060f21b8..558924466047 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6617,12 +6617,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ public void clearAccessibilityFocus() { - if ((mPrivateFlags2 & PFLAG2_ACCESSIBILITY_FOCUSED) != 0) { - mPrivateFlags2 &= ~PFLAG2_ACCESSIBILITY_FOCUSED; - invalidate(); - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED); - notifyAccessibilityStateChanged(); - } + clearAccessibilityFocusNoCallbacks(); // Clear the global reference of accessibility focus if this // view or any of its descendants had accessibility focus. ViewRootImpl viewRootImpl = getViewRootImpl(); @@ -6669,6 +6664,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if ((mPrivateFlags2 & PFLAG2_ACCESSIBILITY_FOCUSED) != 0) { mPrivateFlags2 &= ~PFLAG2_ACCESSIBILITY_FOCUSED; invalidate(); + sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED); + notifyAccessibilityStateChanged(); } } |