commit 9dc2cc53ac332d73376f64cc8e7c713762d74bdd
author Svetoslav Ganov <svetoslavganov@google.com> Tue Jul 03 21:11:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 03 21:11:35 2012 -0700
tree 75442dae13e9145e9b08cc2d98c2dbb693da796d
parent bcda64bfacdf7470db31ca0951728c4a7116808a
parent 983119ab22a18c743e4084dff27f35e3f490dd34

Merge "AccessibilityNodeInfo bounds in screen incorrect if application scale not one."

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d04bbcd..c269ea3 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4697,10 +4697,14 @@
      */
     void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
         Rect bounds = mAttachInfo.mTmpInvalRect;
+        final float applicationScale = mAttachInfo.mApplicationScale;
+
         getDrawingRect(bounds);
+        bounds.scale(applicationScale);
         info.setBoundsInParent(bounds);
 
         getBoundsOnScreen(bounds);
+        bounds.scale(applicationScale);
         info.setBoundsInScreen(bounds);
 
         ViewParent parent = getParentForAccessibility();

core/java/android/widget/NumberPicker.java

diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index 02bcf1e..eabcb80 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -2421,14 +2421,22 @@
             info.setParent((View) getParentForAccessibility());
             info.setEnabled(NumberPicker.this.isEnabled());
             info.setScrollable(true);
+
+            final float applicationScale =
+                getContext().getResources().getCompatibilityInfo().applicationScale;
+
             Rect boundsInParent = mTempRect;
             boundsInParent.set(left, top, right, bottom);
+            boundsInParent.scale(applicationScale);
             info.setBoundsInParent(boundsInParent);
+
             info.setVisibleToUser(isVisibleToUser());
+
             Rect boundsInScreen = boundsInParent;
             int[] locationOnScreen = mTempArray;
             getLocationOnScreen(locationOnScreen);
             boundsInScreen.offset(locationOnScreen[0], locationOnScreen[1]);
+            boundsInScreen.scale(applicationScale);
             info.setBoundsInScreen(boundsInScreen);
 
             if (mAccessibilityFocusedView != View.NO_ID) {