Merge "NumberPicker not announcing current selection." into lmp-dev
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index ee17b78..345eafb 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1878,6 +1878,9 @@
         if (mOnValueChangeListener != null) {
             mOnValueChangeListener.onValueChange(this, previous, mValue);
         }
+
+        mAccessibilityNodeProvider.sendAccessibilityEventForVirtualText(
+                AccessibilityEvent.TYPE_VIEW_FOCUSED);
     }
 
     /**
@@ -2556,6 +2559,7 @@
             getLocationOnScreen(locationOnScreen);
             boundsInScreen.offset(locationOnScreen[0], locationOnScreen[1]);
             info.setBoundsInScreen(boundsInScreen);
+            info.setLiveRegion(View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE);
             return info;
         }