Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74bfea76 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am a630dcdb: am ecde72fe: Ensure the IME is rendered above the surface when we... 

am a630dcdb: am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.

Merge commit 'a630dcdb'

* commit 'a630dcdb':
  Ensure the IME is rendered above the surface when we z-order the surface to be on top.
parents a2af5bc9 a630dcdb

core/java/android/view/SurfaceView.java

+8 −2
Original line number Diff line number Diff line
@@ -320,8 +320,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;

        }

    }

    

    /**