diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-04-25 17:14:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 17:14:33 -0700 |
| commit | afab4fd00b0e045027442bfc43e9fb1afb56aa04 (patch) | |
| tree | 408505eabbd34d669349b79b1191c6632cb3b16d | |
| parent | 68a13f3df46d675671d08202e76f6f18d423fda7 (diff) | |
| parent | c6eeacd9341c0348c2eb29d1808eb17ea08464f4 (diff) | |
| download | frameworks_base-afab4fd00b0e045027442bfc43e9fb1afb56aa04.zip frameworks_base-afab4fd00b0e045027442bfc43e9fb1afb56aa04.tar.gz frameworks_base-afab4fd00b0e045027442bfc43e9fb1afb56aa04.tar.bz2 | |
am c6eeacd9: am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev
* commit 'c6eeacd9341c0348c2eb29d1808eb17ea08464f4':
Lockscreen widgets not always announced.
| -rw-r--r-- | core/java/android/view/View.java | 9 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 02ce2be..ee49e2c 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6632,12 +6632,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(); @@ -6684,6 +6679,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(); } } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java index 010e2a3..c566457 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java @@ -169,6 +169,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit KeyguardWidgetFrame newWidgetPage = getWidgetPageAt(newPageIndex); if (newWidgetPage != null) { newWidgetPage.onActive(true); + newWidgetPage.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); newWidgetPage.requestAccessibilityFocus(); } if (mParent != null && AccessibilityManager.getInstance(mContext).isEnabled()) { |