summaryrefslogtreecommitdiff
path: root/core/java/android/view/Window.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-13 19:50:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-13 19:50:36 -0700
commit2388ad9eef109fa7f63c196c819c83f0376f0645 (patch)
tree19c965b6d7efb893604fc448cebc9380ebb60fb6 /core/java/android/view/Window.java
parentfc6d300f408959b11f86623ea7a0ce547ded3563 (diff)
parentf8d9379bd834573feca085284970cf686993c330 (diff)
am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'f8d9379bd834573feca085284970cf686993c330' * commit 'f8d9379bd834573feca085284970cf686993c330': IME events are now dispatched to native applications.
Diffstat (limited to 'core/java/android/view/Window.java')
-rw-r--r--core/java/android/view/Window.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 9b31b9c812e6..be681cc04796 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -485,7 +485,7 @@ public abstract class Window {
* to operate (such as for receiving input events). The given SurfaceHolder
* callback will be used to tell you about state changes to the surface.
*/
- public abstract void takeSurface(SurfaceHolder.Callback callback);
+ public abstract void takeSurface(SurfaceHolder.Callback2 callback);
/**
* Take ownership of this window's InputQueue. The window will no