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

Commit 8f8a1331 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove some functions @hide in WindowContainerTransaction" into tm-dev am: 34e18413 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741151



Change-Id: Ic4a8a3e6f57ab1071eaf85bb80485d6f0dad6c3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c5ce876 34e18413

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3387,6 +3387,7 @@ package android.window { 


  public final class WindowContainerTransaction implements android.os.Parcelable {

    ctor public WindowContainerTransaction();

    method @NonNull public android.window.WindowContainerTransaction clearLaunchAdjacentFlagRoot(@NonNull android.window.WindowContainerToken);

    method @NonNull public android.window.WindowContainerTransaction createTaskFragment(@NonNull android.window.TaskFragmentCreationParams);

    method @NonNull public android.window.WindowContainerTransaction deleteTaskFragment(@NonNull android.window.WindowContainerToken);

    method public int describeContents();
@@ -3405,6 +3406,7 @@ package android.window { 
    method @NonNull public android.window.WindowContainerTransaction setErrorCallbackToken(@NonNull android.os.IBinder);

    method @NonNull public android.window.WindowContainerTransaction setFocusable(@NonNull android.window.WindowContainerToken, boolean);

    method @NonNull public android.window.WindowContainerTransaction setHidden(@NonNull android.window.WindowContainerToken, boolean);

    method @NonNull public android.window.WindowContainerTransaction setLaunchAdjacentFlagRoot(@NonNull android.window.WindowContainerToken);

    method @NonNull public android.window.WindowContainerTransaction setLaunchRoot(@NonNull android.window.WindowContainerToken, @Nullable int[], @Nullable int[]);

    method @NonNull public android.window.WindowContainerTransaction setScreenSizeDp(@NonNull android.window.WindowContainerToken, int, int);

    method @NonNull public android.window.WindowContainerTransaction setSmallestScreenWidthDp(@NonNull android.window.WindowContainerToken, int);

core/java/android/window/WindowContainerTransaction.java

+0 −4
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ public final class WindowContainerTransaction implements Parcelable { 
    /**

     * Sets the container as launch adjacent flag root. Task starting with

     * {@link FLAG_ACTIVITY_LAUNCH_ADJACENT} will be launching to.

     *

     * @hide

     */

    @NonNull

    public WindowContainerTransaction setLaunchAdjacentFlagRoot(
@@ -409,8 +407,6 @@ public final class WindowContainerTransaction implements Parcelable { 


    /**

     * Clears launch adjacent flag root for the display area of passing container.

     *

     * @hide

     */

    @NonNull

    public WindowContainerTransaction clearLaunchAdjacentFlagRoot(