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

Commit 06ad3f19 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."

parents 92bebc32 e43fca99

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23471,6 +23471,7 @@ package android.view { 
    method public abstract void setTitleColor(int);

    method public void setType(int);

    method public void setUiOptions(int);

    method public void setUiOptions(int, int);

    method public abstract void setVolumeControlStream(int);

    method public void setWindowAnimations(int);

    method public void setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String);

core/java/android/view/Window.java

+8 −0
Original line number Diff line number Diff line
@@ -1219,4 +1219,12 @@ public abstract class Window { 
     * @param uiOptions Flags specifying extra options for this window.

     */

    public void setUiOptions(int uiOptions) { }



    /**

     * Set extra options that will influence the UI for this window.

     * Only the bits filtered by mask will be modified.

     * @param uiOptions Flags specifying extra options for this window.

     * @param mask Flags specifying which options should be modified. Others will remain unchanged.

     */

    public void setUiOptions(int uiOptions, int mask) { }

}

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+5 −0
Original line number Diff line number Diff line
@@ -234,6 +234,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        mUiOptions = uiOptions;

    }



    @Override

    public void setUiOptions(int uiOptions, int mask) {

        mUiOptions = (mUiOptions & ~mask) | (uiOptions & mask);

    }



    @Override

    public void setContentView(int layoutResID) {

        if (mContentParent == null) {