diff options
| author | 2022-06-08 07:48:59 +0000 | |
|---|---|---|
| committer | 2022-06-08 07:48:59 +0000 | |
| commit | 3b3c628f63bb269840126a6a6c6316b19a8a4576 (patch) | |
| tree | 4a33b4b6aada245969b98ba09e7698c180941129 | |
| parent | 0ea4431a84563cc07479fbbadb5eef33ebc5c8e5 (diff) | |
| parent | 15578338b53053878264a07d201d32ac4fdde698 (diff) | |
Merge "[DO NOT MERGE] Fix founction not found on tm cts tests" into tm-qpr-dev
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/window/WindowContainerTransaction.java | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 820f1c525205..8bfb1aef1989 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3400,6 +3400,7 @@ package android.window { 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); + method @Deprecated @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken, boolean); method @NonNull public android.window.WindowContainerTransaction setAdjacentTaskFragments(@NonNull android.os.IBinder, @Nullable android.os.IBinder, @Nullable android.window.WindowContainerTransaction.TaskFragmentAdjacentParams); method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect); method @NonNull public android.window.WindowContainerTransaction setBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect); diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index 633d87937049..a87b91d87f1c 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -392,6 +392,19 @@ public final class WindowContainerTransaction implements Parcelable { } /** + * This is temp function for compatible with old cts tests suite and it equal to + * {@link #setAdjacentRoots(WindowContainerToken, WindowContainerToken). + * @deprecated should use {@link #setAdjacentRoots(WindowContainerToken, WindowContainerToken)} + */ + @Deprecated + @NonNull + public WindowContainerTransaction setAdjacentRoots( + @NonNull WindowContainerToken root1, @NonNull WindowContainerToken root2, + boolean moveTogether) { + return setAdjacentRoots(root1, root2); + } + + /** * Sets the container as launch adjacent flag root. Task starting with * {@link FLAG_ACTIVITY_LAUNCH_ADJACENT} will be launching to. */ |