Merge "Does not compile!!!"

Author: Amith Yamasani

Android.mk

@@ -143,8 +143,6 @@ LOCAL_SRC_FILES += \
 	core/java/android/view/accessibility/IAccessibilityManager.aidl \
 	core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
 	core/java/android/view/IApplicationToken.aidl \
-	core/java/android/view/IInputFilter.aidl \
-	core/java/android/view/IInputFilterHost.aidl \
 	core/java/android/view/IOnKeyguardExitResult.aidl \
 	core/java/android/view/IRotationWatcher.aidl \
 	core/java/android/view/IWindow.aidl \

core/java/android/view/AccessibilityInteractionController.java

@@ -141,7 +141,7 @@ private boolean isShown(View view) {
     }
 
     public void findAccessibilityNodeInfoByAccessibilityIdClientThread(
-            long accessibilityNodeId, int interactionId,
+            long accessibilityNodeId, int windowLeft, int windowTop, int interactionId,
             IAccessibilityInteractionConnectionCallback callback, int flags, int interrogatingPid,
             long interrogatingTid) {
         Message message = mHandler.obtainMessage();
@@ -153,6 +153,12 @@ public void findAccessibilityNodeInfoByAccessibilityIdClientThread(
         args.argi2 = AccessibilityNodeInfo.getVirtualDescendantId(accessibilityNodeId);
         args.argi3 = interactionId;
         args.arg1 = callback;
+
+        SomeArgs moreArgs = mPool.acquire();
+        moreArgs.argi1 = windowLeft;
+        moreArgs.argi2 = windowTop;
+        args.arg2 = moreArgs;
+
         message.obj = args;
 
         // If the interrogation is performed by the same thread as the main UI
@@ -177,6 +183,11 @@ private void findAccessibilityNodeInfoByAccessibilityIdUiThread(Message message)
         final IAccessibilityInteractionConnectionCallback callback =
             (IAccessibilityInteractionConnectionCallback) args.arg1;
 
+        SomeArgs moreArgs = (SomeArgs) args.arg2;
+        mViewRootImpl.mAttachInfo.mActualWindowLeft = moreArgs.argi1;
+        mViewRootImpl.mAttachInfo.mActualWindowTop = moreArgs.argi2;
+
+        mPool.release(moreArgs);
         mPool.release(args);
 
         List<AccessibilityNodeInfo> infos = mTempAccessibilityNodeInfoList;
@@ -209,8 +220,9 @@ private void findAccessibilityNodeInfoByAccessibilityIdUiThread(Message message)
     }
 
     public void findAccessibilityNodeInfoByViewIdClientThread(long accessibilityNodeId,
-            int viewId, int interactionId, IAccessibilityInteractionConnectionCallback callback,
-            int flags, int interrogatingPid, long interrogatingTid) {
+            int viewId, int windowLeft, int windowTop, int interactionId,
+            IAccessibilityInteractionConnectionCallback callback, int flags, int interrogatingPid,
+            long interrogatingTid) {
         Message message = mHandler.obtainMessage();
         message.what = PrivateHandler.MSG_FIND_ACCESSIBLITY_NODE_INFO_BY_VIEW_ID;
         message.arg1 = flags;
@@ -221,6 +233,11 @@ public void findAccessibilityNodeInfoByViewIdClientThread(long accessibilityNode
         args.argi2 = interactionId;
         args.arg1 = callback;
 
+        SomeArgs moreArgs = mPool.acquire();
+        moreArgs.argi1 = windowLeft;
+        moreArgs.argi2 = windowTop;
+        args.arg2 = moreArgs;
+
         message.obj = args;
 
         // If the interrogation is performed by the same thread as the main UI
@@ -245,6 +262,11 @@ private void findAccessibilityNodeInfoByViewIdUiThread(Message message) {
         final IAccessibilityInteractionConnectionCallback callback =
             (IAccessibilityInteractionConnectionCallback) args.arg1;
 
+        SomeArgs moreArgs = (SomeArgs) args.arg2;
+        mViewRootImpl.mAttachInfo.mActualWindowLeft = moreArgs.argi1;
+        mViewRootImpl.mAttachInfo.mActualWindowTop = moreArgs.argi2;
+
+        mPool.release(moreArgs);
         mPool.release(args);
 
         AccessibilityNodeInfo info = null;
@@ -278,19 +300,25 @@ private void findAccessibilityNodeInfoByViewIdUiThread(Message message) {
     }
 
     public void findAccessibilityNodeInfosByTextClientThread(long accessibilityNodeId,
-            String text, int interactionId, IAccessibilityInteractionConnectionCallback callback,
-            int flags, int interrogatingPid, long interrogatingTid) {
+            String text, int windowLeft, int windowTop, int interactionId,
+            IAccessibilityInteractionConnectionCallback callback, int flags,
+            int interrogatingPid, long interrogatingTid) {
         Message message = mHandler.obtainMessage();
         message.what = PrivateHandler.MSG_FIND_ACCESSIBLITY_NODE_INFO_BY_TEXT;
         message.arg1 = flags;
 
         SomeArgs args = mPool.acquire();
         args.arg1 = text;
-        args.arg2 = callback;
         args.argi1 = AccessibilityNodeInfo.getAccessibilityViewId(accessibilityNodeId);
         args.argi2 = AccessibilityNodeInfo.getVirtualDescendantId(accessibilityNodeId);
         args.argi3 = interactionId;
 
+        SomeArgs moreArgs = mPool.acquire();
+        moreArgs.arg1 = callback;
+        moreArgs.argi1 = windowLeft;
+        moreArgs.argi2 = windowTop;
+        args.arg2 = moreArgs;
+
         message.obj = args;
 
         // If the interrogation is performed by the same thread as the main UI
@@ -310,11 +338,17 @@ private void findAccessibilityNodeInfosByTextUiThread(Message message) {
 
         SomeArgs args = (SomeArgs) message.obj;
         final String text = (String) args.arg1;
-        final IAccessibilityInteractionConnectionCallback callback =
-            (IAccessibilityInteractionConnectionCallback) args.arg2;
         final int accessibilityViewId = args.argi1;
         final int virtualDescendantId = args.argi2;
         final int interactionId = args.argi3;
+
+        SomeArgs moreArgs = (SomeArgs) args.arg2;
+        final IAccessibilityInteractionConnectionCallback callback =
+            (IAccessibilityInteractionConnectionCallback) moreArgs.arg1;
+        mViewRootImpl.mAttachInfo.mActualWindowLeft = moreArgs.argi1;
+        mViewRootImpl.mAttachInfo.mActualWindowTop = moreArgs.argi2;
+
+        mPool.release(moreArgs);
         mPool.release(args);
 
         List<AccessibilityNodeInfo> infos = null;
@@ -375,9 +409,9 @@ private void findAccessibilityNodeInfosByTextUiThread(Message message) {
         }
     }
 
-    public void findFocusClientThread(long accessibilityNodeId, int focusType, int interactionId,
-            IAccessibilityInteractionConnectionCallback callback, int flags, int interogatingPid,
-            long interrogatingTid) {
+    public void findFocusClientThread(long accessibilityNodeId, int focusType, int windowLeft,
+            int windowTop, int interactionId, IAccessibilityInteractionConnectionCallback callback,
+            int flags, int interogatingPid, long interrogatingTid) {
         Message message = mHandler.obtainMessage();
         message.what = PrivateHandler.MSG_FIND_FOCUS;
         message.arg1 = flags;
@@ -389,6 +423,11 @@ public void findFocusClientThread(long accessibilityNodeId, int focusType, int i
         args.argi3 = AccessibilityNodeInfo.getVirtualDescendantId(accessibilityNodeId);
         args.arg1 = callback;
 
+        SomeArgs moreArgs = mPool.acquire();
+        moreArgs.argi1 = windowLeft;
+        moreArgs.argi2 = windowTop;
+        args.arg2 = moreArgs;
+
         message.obj = args;
 
         // If the interrogation is performed by the same thread as the main UI
@@ -414,6 +453,11 @@ private void findFocusUiThread(Message message) {
         final IAccessibilityInteractionConnectionCallback callback =
             (IAccessibilityInteractionConnectionCallback) args.arg1;
 
+        SomeArgs moreArgs = (SomeArgs) args.arg2;
+        mViewRootImpl.mAttachInfo.mActualWindowLeft = moreArgs.argi1;
+        mViewRootImpl.mAttachInfo.mActualWindowTop = moreArgs.argi2;
+
+        mPool.release(moreArgs);
         mPool.release(args);
 
         AccessibilityNodeInfo focused = null;
@@ -472,9 +516,9 @@ private void findFocusUiThread(Message message) {
         }
     }
 
-    public void focusSearchClientThread(long accessibilityNodeId, int direction, int interactionId,
-            IAccessibilityInteractionConnectionCallback callback, int flags, int interogatingPid,
-            long interrogatingTid) {
+    public void focusSearchClientThread(long accessibilityNodeId, int direction, int windowLeft,
+            int windowTop, int interactionId, IAccessibilityInteractionConnectionCallback callback,
+            int flags, int interogatingPid, long interrogatingTid) {
         Message message = mHandler.obtainMessage();
         message.what = PrivateHandler.MSG_FOCUS_SEARCH;
         message.arg1 = flags;
@@ -486,6 +530,11 @@ public void focusSearchClientThread(long accessibilityNodeId, int direction, int
         args.argi3 = interactionId;
         args.arg1 = callback;
 
+        SomeArgs moreArgs = mPool.acquire();
+        moreArgs.argi1 = windowLeft;
+        moreArgs.argi2 = windowTop;
+        args.arg2 = moreArgs;
+
         message.obj = args;
 
         // If the interrogation is performed by the same thread as the main UI
@@ -511,6 +560,11 @@ private void focusSearchUiThread(Message message) {
         final IAccessibilityInteractionConnectionCallback callback =
             (IAccessibilityInteractionConnectionCallback) args.arg1;
 
+        SomeArgs moreArgs = (SomeArgs) args.arg2;
+        mViewRootImpl.mAttachInfo.mActualWindowLeft = moreArgs.argi1;
+        mViewRootImpl.mAttachInfo.mActualWindowTop = moreArgs.argi2;
+
+        mPool.release(moreArgs);
         mPool.release(args);
 
         AccessibilityNodeInfo next = null;

core/java/android/view/IInputFilter.aidl

@@ -23,7 +23,6 @@ import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Point;
-import android.graphics.Rect;
 import android.os.IRemoteCallback;
 import android.view.IApplicationToken;
 import android.view.IOnKeyguardExitResult;
@@ -34,7 +33,6 @@ import android.view.InputEvent;
 import android.view.MotionEvent;
 import android.view.InputChannel;
 import android.view.InputDevice;
-import  android.view.IInputFilter;
 
 /**
  * System private interface to the window manager.
@@ -210,24 +208,4 @@ interface IWindowManager
      * Lock the device immediately.
      */
     void lockNow();
-
-    /**
-     * Gets the token for the focused window.
-     */
-    IBinder getFocusedWindowToken();
-
-    /**
-     * Gets the frame on the screen of the window given its token.
-     */
-    boolean getWindowFrame(IBinder token, out Rect outBounds);
-
-    /**
-     * Gets the compatibility scale of e window given its token.
-     */
-    float getWindowCompatibilityScale(IBinder windowToken);
-
-    /**
-     * Sets an input filter for manipulating the input event stream.
-     */
-    void setInputFilter(in IInputFilter filter);
 }

core/java/android/view/IInputFilterHost.aidl

@@ -4760,6 +4760,30 @@ void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
         }
     }
 
+    /**
+     * 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
@@ -17117,6 +17141,20 @@ public void setPooled(boolean isPooled) {
          */
         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
          */