am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread

Merge commit 'e3e2883f2232007174ead562610eb01201890d9b'

* commit 'e3e2883f2232007174ead562610eb01201890d9b':
  First stab at attaching native event dispatching.

1 files changed, 12 insertions, 0 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index eea855d..5e73b97 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -56,6 +56,7 @@ import android.util.SparseArray;
 import android.view.ActionBarView;
 import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
+import android.view.InputConsumer;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -69,6 +70,7 @@ import android.view.ViewManager;
 import android.view.VolumePanel;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.InputConsumer.Callback;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.animation.Animation;
@@ -107,6 +109,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
     SurfaceHolder.Callback mTakeSurfaceCallback;
     BaseSurfaceHolder mSurfaceHolder;
     
+    InputConsumer.Callback mTakeInputChannelCallback;
+    
     private boolean mIsFloating;
 
     private LayoutInflater mLayoutInflater;
@@ -252,6 +256,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         mTakeSurfaceCallback = callback;
     }
     
+    public void takeInputChannel(InputConsumer.Callback callback) {
+        mTakeInputChannelCallback = callback;
+    }
+    
     @Override
     public boolean isFloating() {
         return mIsFloating;
@@ -2066,6 +2074,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             return mFeatureId < 0 ? mTakeSurfaceCallback : null;
         }
         
+        public InputConsumer.Callback willYouTakeTheInputConsumer() {
+            return mFeatureId < 0 ? mTakeInputChannelCallback : null;
+        }
+        
         public void setSurfaceType(int type) {
             PhoneWindow.this.setType(type);
         }