summaryrefslogtreecommitdiff
path: root/core/java/android/view/Window.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-13 18:55:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-13 18:55:52 -0700
commitf8d9379bd834573feca085284970cf686993c330 (patch)
treed603a4c197ba91ab2103a04d244e3f1004bef9e3 /core/java/android/view/Window.java
parent89ee578b7053d27a50922f82feb94bf6054b330c (diff)
parentd76b67c340d1564abf8d14d976fdaf83bf2b3320 (diff)
am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp * commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320': 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 f40734b2c05a..11c09c1b2d45 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -478,7 +478,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