| commit | bef72a409e68e17d5781c565592da2ffc166a549 | [log] [tgz] |
|---|---|---|
| author | Louis Chang <louischang@google.com> | Thu Feb 02 15:10:44 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 02 15:10:44 2023 +0000 |
| tree | fb647c5369abce41558b79ffd739aae87abffec9 | |
| parent | 98e0185091d8e30f14f07bb7185f34a2275fc2fc [diff] | |
| parent | 66f52cb098e32c3528c4bad62aee2487fdda6496 [diff] |
Merge "Implementing new ActivityEmbeddingComponent APIs"
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java index 666b472..76e0e1e 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java
@@ -48,7 +48,7 @@ // TODO(b/241126279) Introduce constants to better version functionality @Override public int getVendorApiLevel() { - return 2; + return 3; } @NonNull
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 57ba6bb..ff58201 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
@@ -230,6 +230,14 @@ return mSplitAttributesCalculator; } + @Override + @NonNull + public ActivityOptions setLaunchingActivityStack(@NonNull ActivityOptions options, + @NonNull IBinder token) { + options.setLaunchTaskFragmentToken(token); + return options; + } + @NonNull @GuardedBy("mLock") @VisibleForTesting @@ -2064,6 +2072,7 @@ transactionRecord.apply(false /* shouldApplyIndependently */); // Amend the request to let the WM know that the activity should be placed in // the dedicated container. + // TODO(b/229680885): skip override launching TaskFragment token by split-rule options.putBinder(ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN, launchedInTaskFragment.getTaskFragmentToken()); mCurrentIntent = intent;
diff --git a/libs/WindowManager/Jetpack/window-extensions-release.aar b/libs/WindowManager/Jetpack/window-extensions-release.aar index 60510c6..7a6f46c 100644 --- a/libs/WindowManager/Jetpack/window-extensions-release.aar +++ b/libs/WindowManager/Jetpack/window-extensions-release.aar Binary files differ