diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-03-01 12:09:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-01 12:09:10 -0800 |
| commit | a630dcdb956f9acb028dd03bc63b28874f100f8a (patch) | |
| tree | ef4484f832dc13e1b3fd84437280c16042b212f4 | |
| parent | cbe4f88747b56a753e4a9bf061946f4c6f051243 (diff) | |
| parent | ecde72fe411811ca02a2565bf73b86e6e8ddc76b (diff) | |
| download | frameworks_base-a630dcdb956f9acb028dd03bc63b28874f100f8a.zip frameworks_base-a630dcdb956f9acb028dd03bc63b28874f100f8a.tar.gz frameworks_base-a630dcdb956f9acb028dd03bc63b28874f100f8a.tar.bz2 | |
am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Merge commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b' into eclair-mr2-plus-aosp
* commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b':
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index ca5e1de..a79a91c 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -319,8 +319,14 @@ public class SurfaceView extends View { * <p>Calling this overrides any previous call to {@link #setZOrderMediaOverlay}. */ public void setZOrderOnTop(boolean onTop) { - mWindowType = onTop ? WindowManager.LayoutParams.TYPE_APPLICATION_PANEL - : WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; + if (onTop) { + mWindowType = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; + // ensures the surface is placed below the IME + mLayout.flags |= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; + } else { + mWindowType = WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; + mLayout.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; + } } /** |