diff options
| author | 2022-08-29 17:36:21 +0000 | |
|---|---|---|
| committer | 2022-08-29 17:36:21 +0000 | |
| commit | 6757ccaaebf6fbcf5d5959d80dfcc704ada058f3 (patch) | |
| tree | e7fd618268fdbf55140d8a01f3f3a62224c81fca | |
| parent | b6fc109390b5276a5fafb314cc6bda866a499778 (diff) | |
| parent | 3d65738ac7945f3b498250b8027400b908ed5008 (diff) | |
Merge "Make WCT#requestFocusOnTaskFragment a TestApi" into tm-qpr-dev am: 69d314f23e am: 3d65738ac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19745196
Change-Id: Ieac08be96474c2685605f9a5667c91a4f46ff206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/window/WindowContainerTransaction.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index bb6cc45b86d5..53014a3c580e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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); diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index ff7ea317d3f8..db58704b5d6a 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -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) { |