Tell system server whether the app handled input events.

Refactored ViewRoot, NativeActivity and related classes to tell the
dispatcher whether an input event was actually handled by the application.

This will be used to move more of the global default key processing
into the system server instead of the application.

Change-Id: If06b98b6f45c543e5ac5b1eae2b3baf9371fba28

1 files changed, 25 insertions, 6 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 30aab47..4bc7433 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -253,13 +253,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     
     private final InputHandler mPointerLocationInputHandler = new BaseInputHandler() {
         @Override
-        public void handleMotion(MotionEvent event, Runnable finishedCallback) {
-            finishedCallback.run();
-            
-            synchronized (mLock) {
-                if (mPointerLocationView != null) {
-                    mPointerLocationView.addTouchEvent(event);
+        public void handleMotion(MotionEvent event, InputQueue.FinishedCallback finishedCallback) {
+            boolean handled = false;
+            try {
+                if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {
+                    synchronized (mLock) {
+                        if (mPointerLocationView != null) {
+                            mPointerLocationView.addTouchEvent(event);
+                            handled = true;
+                        }
+                    }
                 }
+            } finally {
+                finishedCallback.finished(handled);
             }
         }
     };
@@ -1329,6 +1335,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         return false;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public boolean dispatchUnhandledKey(WindowState win, int action, int flags,
+            int keyCode, int scanCode, int metaState, int repeatCount, int policyFlags) {
+        if (false) {
+            Slog.d(TAG, "Unhandled key: win=" + win + ", action=" + action
+                    + ", flags=" + flags + ", keyCode=" + keyCode
+                    + ", scanCode=" + scanCode + ", metaState=" + metaState
+                    + ", repeatCount=" + repeatCount + ", policyFlags=" + policyFlags);
+        }
+        return false;
+    }
+
     /**
      * A home key -> launch home action was detected.  Take the appropriate action
      * given the situation with the keyguard.