commit 1e4b9f3936d6f357e89360293e05a0e16d5fa440
author Dianne Hackborn <hackbod@google.com> Wed Jun 23 14:10:57 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Wed Jun 23 14:37:30 2010 -0700
tree 4fc65451804b3d2741969ecb7bfd3d415f54ec51
parent 69a4817e3e1e368e758ff8c238deb5ee26963c04

Remove InputConsumer, replacing with InputQueue.

Change-Id: Ib06907278457aaee842b123adc072840ca3602d8

core/java/android/view/ViewRoot.java

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 8984b74..4854190 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -154,8 +154,8 @@
 
     final View.AttachInfo mAttachInfo;
     InputChannel mInputChannel;
-    InputConsumer.Callback mInputConsumerCallback;
-    InputConsumer mInputConsumer;
+    InputQueue.Callback mInputQueueCallback;
+    InputQueue mInputQueue;
     
     final Rect mTempRect; // used in the transaction to not thrash the heap.
     final Rect mVisRect; // used to retrieve visible rect of focused view.
@@ -558,12 +558,12 @@
 
                 if (WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH) {
                     if (view instanceof RootViewSurfaceTaker) {
-                        mInputConsumerCallback =
-                            ((RootViewSurfaceTaker)view).willYouTakeTheInputConsumer();
+                        mInputQueueCallback =
+                            ((RootViewSurfaceTaker)view).willYouTakeTheInputQueue();
                     }
-                    if (mInputConsumerCallback != null) {
-                        mInputConsumer = new InputConsumer(mInputChannel);
-                        mInputConsumerCallback.onInputConsumerCreated(mInputConsumer);
+                    if (mInputQueueCallback != null) {
+                        mInputQueue = new InputQueue(mInputChannel);
+                        mInputQueueCallback.onInputQueueCreated(mInputQueue);
                     } else {
                         InputQueue.registerInputChannel(mInputChannel, mInputHandler,
                                 Looper.myQueue());
@@ -1747,9 +1747,9 @@
 
         if (WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH) {
             if (mInputChannel != null) {
-                if (mInputConsumerCallback != null) {
-                    mInputConsumerCallback.onInputConsumerDestroyed(mInputConsumer);
-                    mInputConsumerCallback = null;
+                if (mInputQueueCallback != null) {
+                    mInputQueueCallback.onInputQueueDestroyed(mInputQueue);
+                    mInputQueueCallback = null;
                 } else {
                     InputQueue.unregisterInputChannel(mInputChannel);
                 }