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

Commit 6757ccaa authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Make WCT#requestFocusOnTaskFragment a TestApi" into tm-qpr-dev am: 69d314f2 am: 3d65738a 

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



Change-Id: Ieac08be96474c2685605f9a5667c91a4f46ff206
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6fc1093 3d65738a

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3391,6 +3391,7 @@ package android.window { 
    method @NonNull public android.window.WindowContainerTransaction reparentActivityToTaskFragment(@NonNull android.os.IBinder, @NonNull android.os.IBinder);

    method @NonNull public android.window.WindowContainerTransaction reparentChildren(@NonNull android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken);

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

    method @NonNull public android.window.WindowContainerTransaction requestFocusOnTaskFragment(@NonNull android.os.IBinder);

    method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

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

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

core/java/android/window/WindowContainerTransaction.java

+0 −1
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ public final class WindowContainerTransaction implements Parcelable { 
     * TaskFragment.

     * @param fragmentToken client assigned unique token to create TaskFragment with specified in

     *                      {@link TaskFragmentCreationParams#getFragmentToken()}.

     * @hide

     */

    @NonNull

    public WindowContainerTransaction requestFocusOnTaskFragment(@NonNull IBinder fragmentToken) {