Merge "Build DocumentsUI sources once" into aosp-main-future (19ca7c25) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+15 −42

Original line number	Diff line number	Diff line
		@@ -70,14 +70,6 @@ platform_compat_config {
		src: ":DocumentsUI",
		}

		filegroup {
		name: "DocumentsUI-srcs",
		srcs: [
		"src/*/.java",
		":statslog-docsui-java-gen",
		],
		}

		java_library {
		name: "docsui-statsd",
		srcs: [
		@@ -101,14 +93,10 @@ genrule {
		}

		android_library {
		name: "DocumentsUI-res-lib",

		manifest: "AndroidManifest.xml",
		name: "DocumentsUI-lib",
		defaults: ["documentsui_defaults"],

		static_libs: [
		"androidx.appcompat_appcompat",
		"com.google.android.material_material",
		],
		manifest: "AndroidManifestLib.xml",

		resource_dirs: [
		"res",
		@@ -118,6 +106,11 @@ android_library {
		"--auto-add-overlay",
		],

		srcs: [
		"src/*/.java",
		":statslog-docsui-java-gen",
		],

		sdk_version: "system_current",
		target_sdk_version: "33",
		min_sdk_version: "29",
		@@ -128,28 +121,13 @@ android_library {
		}

		android_library {
		name: "DocumentsUIUnitTests-res-lib",

		manifest: "AndroidManifestForUnitTests.xml",

		static_libs: [
		"androidx.appcompat_appcompat",
		"com.google.android.material_material",
		"modules-utils-build_system",
		],

		resource_dirs: [
		"res",
		],
		name: "DocumentsUIManifestLib",
		defaults: ["documentsui_defaults"],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],
		manifest: "AndroidManifest.xml",

		aaptflags: [
		"--auto-add-overlay",
		],
		resource_dirs: [],
		libs: ["DocumentsUI-lib"],

		sdk_version: "system_current",
		target_sdk_version: "33",
		@@ -167,13 +145,8 @@ android_app {

		manifest: "AndroidManifest.xml",

		srcs: [
		":DocumentsUI-srcs",
		],

		resource_dirs: [
		"res",
		],
		static_libs: ["DocumentsUI-lib"],
		resource_dirs: [],

		licenses: [
		"Android-Apache-2.0",

AndroidManifestForUnitTests.xml→AndroidManifestLib.xml

+0 −0

File moved.

View file

perf-tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ android_test {
		manifest: "AndroidManifest.xml",

		srcs: [
		":DocumentsUIPerfTests-files",
		"src/*/.java",
		],

		@@ -23,6 +22,7 @@ android_test {
		],

		static_libs: [
		"DocumentsUIPerfTests-lib",
		"androidx.legacy_legacy-support-v4",
		"androidx.test.rules",
		"androidx.test.espresso.core",

src/com/android/documentsui/ActionModeController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,8 @@ public class ActionModeController extends SelectionObserver<String>
		Log.d(TAG, "Starting action mode.");
		}
		mActionMode = mActivity.startActionMode(this);
		final View closeButton = mActivity.findViewById(R.id.action_mode_close_button);
		final View closeButton =
		mActivity.findViewById(androidx.appcompat.R.id.action_mode_close_button);
		if (closeButton != null) {
		closeButton.setContentDescription(mActivity.getString(android.R.string.cancel));
		}

src/com/android/documentsui/NavigationViewManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,8 @@ public class NavigationViewManager implements AppBarLayout.OnOffsetChangedListen
		// move directory_header out of the AppBarLayout.

		Window window = mActivity.getWindow();
		View actionBar = window.getDecorView().findViewById(R.id.action_mode_bar);
		View actionBar =
		window.getDecorView().findViewById(androidx.appcompat.R.id.action_mode_bar);
		int dynamicHeaderColor = ContextCompat.getColor(mActivity,
		offset == 0 ? mDefaultStatusBarColorResId : R.color.color_surface_header);
		if (actionBar != null) {