Merge "Lockscreen widgets not always announced." into jb-mr2-dev (c38bc5ab) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -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()) {