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

Commit 3acd6932 authored by Stefan Kuhne's avatar Stefan Kuhne Committed by Android (Google) Code Review
Browse files

Merge "Adding missing WindowStackCallback to Window"

parents de0d5d74 9bad7410

core/java/android/app/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -6211,6 +6211,7 @@ public class Activity extends ContextThemeWrapper 
        mFragments.attachHost(null /*parent*/);



        mWindow = new PhoneWindow(this);

        mWindow.setWindowStackCallback(this);

        mWindow.setCallback(this);

        mWindow.setOnWindowDismissedCallback(this);

        mWindow.getLayoutInflater().setPrivateFactory(this);

core/java/android/view/Window.java

+11 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public abstract class Window { 
    private TypedArray mWindowStyle;

    private Callback mCallback;

    private OnWindowDismissedCallback mOnWindowDismissedCallback;

    private WindowStackCallback mWindowStackCallback;

    private WindowManager mWindowManager;

    private IBinder mAppToken;

    private String mAppName;
@@ -680,6 +681,16 @@ public abstract class Window { 
        }

    }



    /** @hide */

    public final void setWindowStackCallback(WindowStackCallback wscb) {

        mWindowStackCallback = wscb;

    }



    /** @hide */

    public final WindowStackCallback getWindowStackCallback() {

        return mWindowStackCallback;

    }



    /**

     * Take ownership of this window's surface.  The window's view hierarchy

     * will no longer draw into the surface, though it will otherwise continue