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

Commit 08b171d0 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Allow mainline modules to set private window flags"

parents 7bc23e6c d66dd99a

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -6600,6 +6600,10 @@ package android.util { 


package android.view {



  public abstract class Window {

    method public void addPrivateFlags(int);

  }



  public abstract interface WindowManager implements android.view.ViewManager {

    method public abstract android.graphics.Region getCurrentImeTouchRegion();

  }
@@ -6607,6 +6611,7 @@ package android.view { 
  public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

    method public final long getUserActivityTimeout();

    method public final void setUserActivityTimeout(long);

    field public static final int PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 524288; // 0x80000

  }



}

core/java/android/view/Window.java

+13 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.LayoutRes; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.StyleRes;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.app.WindowConfiguration;

import android.content.Context;
@@ -1079,8 +1080,18 @@ public abstract class Window { 
        setFlags(flags, flags);

    }



    /** @hide */

    @UnsupportedAppUsage

    /**

     * Add private flag bits.

     *

     * <p>Refer to the individual flags for the permissions needed.

     *

     * <p>Note: Only for updateable system components (aka. mainline modules)

     *

     * @param flags The flag bits to add.

     *

     * @hide

     */

    @SystemApi

    public void addPrivateFlags(int flags) {

        setPrivateFlags(flags, flags);

    }

core/java/android/view/WindowManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1668,6 +1668,7 @@ public interface WindowManager extends ViewManager { 
         * this window is visible.

         * @hide

         */

        @SystemApi

        @RequiresPermission(permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS)

        public static final int PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 0x00080000;