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

Commit 099d350e authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev am: 0b504559 

am: 1f3a56ef

Change-Id: I5ad2558172233f0b4df84e48281f0bbc5c4eaab7
parents e479dbbd 1f3a56ef

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -47335,6 +47335,7 @@ package android.view { 
    field public static final deprecated int MEMORY_TYPE_HARDWARE = 1; // 0x1

    field public static final deprecated int MEMORY_TYPE_NORMAL = 0; // 0x0

    field public static final deprecated int MEMORY_TYPE_PUSH_BUFFERS = 3; // 0x3

    field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40

    field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000

    field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1

    field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2
@@ -47395,6 +47396,7 @@ package android.view { 
    field public java.lang.String packageName;

    field public int preferredDisplayModeId;

    field public deprecated float preferredRefreshRate;

    field public int privateFlags;

    field public int rotationAnimation;

    field public float screenBrightness;

    field public int screenOrientation;

core/java/android/view/WindowManager.java

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.KeyguardManager;

import android.app.Presentation;

import android.content.Context;
@@ -1278,7 +1279,9 @@ public interface WindowManager extends ViewManager { 
        /**

         * Never animate position changes of the window.

         *

         * {@hide} */

         * {@hide}

         */

        @TestApi

        public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 0x00000040;



        /** Window flag: special flag to limit the size of the window to be
@@ -1387,6 +1390,7 @@ public interface WindowManager extends ViewManager { 
         * Control flags that are private to the platform.

         * @hide

         */

        @TestApi

        public int privateFlags;



        /**