From bc7807fcdda84bdea5618187f39336565c20ff78 Mon Sep 17 00:00:00 2001 From: Mary Xia Date: Fri, 30 Dec 2022 15:02:52 +0000 Subject: [PATCH] Revert "Update Window Extensions library APIs" Revert submission 20478705-functional_interface Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?testResultId=TR92628441204212347, bug b/264025195. Reverted changes: /q/submissionid:20478705-functional_interface Tests: https://android-build.googleplex.com/builds/abtd/run/L11300000957955121 Change-Id: I9f43d52c370d95a7a8a1e50746efc56ff3403c9c --- libs/WindowManager/Jetpack/Android.bp | 11 +----- .../extensions/embedding/SplitController.java | 32 ++++------------- .../extensions/embedding/SplitPresenter.java | 7 ++-- .../layout/WindowLayoutComponentImpl.java | 33 ++++-------------- .../embedding/EmbeddingTestUtils.java | 28 ++------------- .../embedding/SplitControllerTest.java | 17 ++++----- .../embedding/SplitPresenterTest.java | 5 ++- .../window-extensions-core-release.aar | Bin 4568 -> 0 bytes .../Jetpack/window-extensions-release.aar | Bin 34072 -> 30820 bytes 9 files changed, 28 insertions(+), 105 deletions(-) delete mode 100644 libs/WindowManager/Jetpack/window-extensions-core-release.aar diff --git a/libs/WindowManager/Jetpack/Android.bp b/libs/WindowManager/Jetpack/Android.bp index a5b192cd7ceb..dc4b5636a246 100644 --- a/libs/WindowManager/Jetpack/Android.bp +++ b/libs/WindowManager/Jetpack/Android.bp @@ -63,12 +63,6 @@ android_library_import { sdk_version: "current", } -android_library_import { - name: "window-extensions-core", - aars: ["window-extensions-core-release.aar"], - sdk_version: "current", -} - java_library { name: "androidx.window.extensions", srcs: [ @@ -76,10 +70,7 @@ java_library { "src/androidx/window/util/**/*.java", "src/androidx/window/common/**/*.java", ], - static_libs: [ - "window-extensions", - "window-extensions-core", - ], + static_libs: ["window-extensions"], installable: true, sdk_version: "core_platform", system_ext_specific: true, 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 85812ea3d72d..1af1313f0bbb 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -75,10 +75,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.window.common.CommonFoldingFeature; import androidx.window.common.EmptyLifecycleCallbacksAdapter; -import androidx.window.extensions.WindowExtensionsImpl; import androidx.window.extensions.WindowExtensionsProvider; -import androidx.window.extensions.core.util.function.Consumer; -import androidx.window.extensions.core.util.function.Function; import androidx.window.extensions.embedding.TransactionManager.TransactionRecord; import androidx.window.extensions.layout.WindowLayoutComponentImpl; @@ -89,6 +86,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; import java.util.concurrent.Executor; +import java.util.function.Consumer; /** * Main controller class that manages split states and presentation. @@ -114,7 +112,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * A developer-defined {@link SplitAttributes} calculator to compute the current * {@link SplitAttributes} with the current device and window states. - * It is registered via {@link #setSplitAttributesCalculator(Function)} + * It is registered via {@link #setSplitAttributesCalculator(SplitAttributesCalculator)} * and unregistered via {@link #clearSplitAttributesCalculator()}. * This is called when: *