diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-07-13 18:55:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 18:55:52 -0700 |
commit | f8d9379bd834573feca085284970cf686993c330 (patch) | |
tree | d603a4c197ba91ab2103a04d244e3f1004bef9e3 /core/java/com | |
parent | 89ee578b7053d27a50922f82feb94bf6054b330c (diff) | |
parent | d76b67c340d1564abf8d14d976fdaf83bf2b3320 (diff) | |
download | frameworks_base-f8d9379bd834573feca085284970cf686993c330.zip frameworks_base-f8d9379bd834573feca085284970cf686993c330.tar.gz frameworks_base-f8d9379bd834573feca085284970cf686993c330.tar.bz2 |
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/com')
-rw-r--r-- | core/java/com/android/internal/view/RootViewSurfaceTaker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/RootViewSurfaceTaker.java b/core/java/com/android/internal/view/RootViewSurfaceTaker.java index 7ff8d4c..9c1b558 100644 --- a/core/java/com/android/internal/view/RootViewSurfaceTaker.java +++ b/core/java/com/android/internal/view/RootViewSurfaceTaker.java @@ -5,7 +5,7 @@ import android.view.SurfaceHolder; /** hahahah */ public interface RootViewSurfaceTaker { - SurfaceHolder.Callback willYouTakeTheSurface(); + SurfaceHolder.Callback2 willYouTakeTheSurface(); void setSurfaceType(int type); void setSurfaceFormat(int format); void setSurfaceKeepScreenOn(boolean keepOn); |