diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-23 14:43:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 14:43:31 -0700 |
| commit | f92f8686f982c62a609a2087383a77a24d126992 (patch) | |
| tree | 7e5bd21bd0956d8e4dff6fbec46e854a4561e6d1 /core/java/android/view/Window.java | |
| parent | da91bf5c13cc3c0f5f1d59e1a609bb15047f65c8 (diff) | |
| parent | 98f7aed66b54c365f816fe990de978f61155cde1 (diff) | |
am 98f7aed6: am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '98f7aed66b54c365f816fe990de978f61155cde1'
* commit '98f7aed66b54c365f816fe990de978f61155cde1':
Remove InputConsumer, replacing with InputQueue.
Diffstat (limited to 'core/java/android/view/Window.java')
| -rw-r--r-- | core/java/android/view/Window.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 095e585a7f9c..9b31b9c812e6 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -488,11 +488,11 @@ public abstract class Window { public abstract void takeSurface(SurfaceHolder.Callback callback); /** - * Take ownership of this window's InputChannel. The window will no - * longer read and dispatch input events from the channel; it is your + * Take ownership of this window's InputQueue. The window will no + * longer read and dispatch input events from the queue; it is your * responsibility to do so. */ - public abstract void takeInputChannel(InputConsumer.Callback callback); + public abstract void takeInputQueue(InputQueue.Callback callback); /** * Return whether this window is being displayed with a floating style |