am 8114f439: am ddbcce81: Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev

* commit '8114f439fe8b409a00ac704b37128922690e2186':
  Cannot interact with dialogs when IME is up and on not touch explored popups.

1 files changed, 39 insertions, 0 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b773c816840a..e680d41ec44a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3594,6 +3594,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 case R.styleable.View_importantForAccessibility:
                     setImportantForAccessibility(a.getInt(attr,
                             IMPORTANT_FOR_ACCESSIBILITY_DEFAULT));
+                    break;
             }
         }
 
@@ -4896,6 +4897,30 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     }
 
     /**
+     * Returns the delta between the actual and last reported window left.
+     *
+     * @hide
+     */
+    public int getActualAndReportedWindowLeftDelta() {
+        if (mAttachInfo != null) {
+            return mAttachInfo.mActualWindowLeft - mAttachInfo.mWindowLeft; 
+        }
+        return 0;
+    }
+
+    /**
+     * Returns the delta between the actual and last reported window top.
+     *
+     * @hide
+     */
+    public int getActualAndReportedWindowTopDelta() {
+        if (mAttachInfo != null) {
+            return mAttachInfo.mActualWindowTop - mAttachInfo.mWindowTop;
+        }
+        return 0;
+    }
+
+    /**
      * Computes whether this view is visible to the user. Such a view is
      * attached, visible, all its predecessors are visible, it is not clipped
      * entirely by its predecessors, and has an alpha greater than zero.
@@ -17294,6 +17319,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         int mWindowTop;
 
         /**
+         * Left actual position of this view's window.
+         *
+         * TODO: This is a workaround for 6623031. Remove when fixed.
+         */
+        int mActualWindowLeft;
+
+        /**
+         * Actual top position of this view's window.
+         *
+         * TODO: This is a workaround for 6623031. Remove when fixed.
+         */
+        int mActualWindowTop;
+
+        /**
          * Indicates whether views need to use 32-bit drawing caches
          */
         boolean mUse32BitDrawingCache;