diff options
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 7f3a500..70049ed 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -147,8 +147,8 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 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. @@ -442,12 +442,12 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 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()); @@ -1598,9 +1598,9 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 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); } |