Merge "Depend on aars in prebuilts/sdk for window extensions" into udc-dev am: 020162792c (fc9f5bfd) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/Android.bp

+2 −16

Original line number	Diff line number	Diff line
		@@ -55,20 +55,6 @@ prebuilt_etc {
		}

		// Extensions
		// NOTE: This module is still under active development and must not
		// be used in production. Use 'androidx.window.sidecar' instead.
		android_library_import {
		name: "window-extensions",
		aars: ["window-extensions-release.aar"],
		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: [
		@@ -77,8 +63,8 @@ java_library {
		"src/androidx/window/common/*/.java",
		],
		static_libs: [
		"window-extensions",
		"window-extensions-core",
		"androidx.window.extensions_extensions-nodeps",
		"androidx.window.extensions.core_core-nodeps",
		],
		installable: true,
		sdk_version: "core_platform",

+0 −10

Original line number	Diff line number	Diff line
		@@ -122,16 +122,6 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
		addWindowLayoutInfoListener(activity, extConsumer);
		}

		@Override
		public void addWindowLayoutInfoListener(@NonNull @UiContext Context context,
		@NonNull java.util.function.Consumer<WindowLayoutInfo> consumer) {
		final Consumer<WindowLayoutInfo> extConsumer = consumer::accept;
		synchronized (mLock) {
		mJavaToExtConsumers.put(consumer, extConsumer);
		}
		addWindowLayoutInfoListener(context, extConsumer);
		}

		/**
		* Similar to {@link #addWindowLayoutInfoListener(Activity, java.util.function.Consumer)}, but
		* takes a UI Context as a parameter.

deleted100644 → 0

−3.63 KiB

File deleted.

deleted100644 → 0

−40.1 KiB

File deleted.