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

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

Merge "Rename system-api wm flags to SYSTEM_..."

parents 03fc4a7f 66ce2386

api/system-current.txt

+5 −2
Original line number Diff line number Diff line
@@ -6650,7 +6650,7 @@ package android.util { 
package android.view {



  public abstract class Window {

    method public void addPrivateFlags(int);

    method public void addSystemFlags(int);

  }



  public abstract interface WindowManager implements android.view.ViewManager {
@@ -6660,7 +6660,10 @@ 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

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

  }



  public static abstract class WindowManager.LayoutParams.SystemFlags implements java.lang.annotation.Annotation {

  }



}

core/java/android/view/Window.java

+15 −2
Original line number Diff line number Diff line
@@ -1085,6 +1085,19 @@ public abstract class Window { 
     *

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

     *

     * @param flags The flag bits to add.

     *

     * @hide

     */

    public void addPrivateFlags(int flags) {

        setPrivateFlags(flags, flags);

    }



    /**

     * Add system 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.
@@ -1092,8 +1105,8 @@ public abstract class Window { 
     * @hide

     */

    @SystemApi

    public void addPrivateFlags(int flags) {

        setPrivateFlags(flags, flags);

    public void addSystemFlags(@WindowManager.LayoutParams.SystemFlags int flags) {

        addPrivateFlags(flags);

    }



    /**

core/java/android/view/WindowManager.java

+15 −3
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ public interface WindowManager extends ViewManager { 
         */

        @SystemApi

        @RequiresPermission(permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS)

        public static final int PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 0x00080000;

        public static final int SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 0x00080000;



        /**

         * Indicates that this window is the rounded corners overlay present on some
@@ -1707,6 +1707,18 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION = 0x00800000;



        /**

         * An internal annotation for flags that can be specified to {@link #softInputMode}.

         *

         * @hide

         */

        @SystemApi

        @Retention(RetentionPolicy.SOURCE)

        @IntDef(flag = true, prefix = { "SYSTEM_FLAG_" }, value = {

                SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

        })

        public @interface SystemFlags {}



        /**

         * Control flags that are private to the platform.

         * @hide
@@ -1781,8 +1793,8 @@ public interface WindowManager extends ViewManager { 
                        equals = PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE,

                        name = "SUSTAINED_PERFORMANCE_MODE"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                        equals = PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                        mask = SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                        equals = SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                        name = "HIDE_NON_SYSTEM_OVERLAY_WINDOWS"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY,

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2770,7 +2770,7 @@ 
        android:protectionLevel="signature" />



    <!-- @SystemApi Allows an application to use

         {@link android.view.WindowManager.LayoutsParams#PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS}

         {@link android.view.WindowManager.LayoutsParams#SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS}

         to hide non-system-overlay windows.

         <p>Not for use by third-party applications.

         @hide

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
*/

package com.android.packageinstaller;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.Manifest;

import android.annotation.NonNull;
@@ -281,7 +281,7 @@ public class PackageInstallerActivity extends AlertActivity { 


    @Override

    protected void onCreate(Bundle icicle) {

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        super.onCreate(null);