Merge changes from topic "DocumentsUI-lib" into main (9868d7c9) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+8 −54

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

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

		java_library {
		name: "docsui-statsd",
		srcs: [
		@@ -93,51 +85,18 @@ genrule {
		}

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

		manifest: "AndroidManifest.xml",

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

		resource_dirs: [
		"res",
		],

		aaptflags: [
		"--auto-add-overlay",
		],

		sdk_version: "system_current",
		target_sdk_version: "33",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		}

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

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

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

		resource_dirs: [
		"res",
		],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],

		aaptflags: [
		"--auto-add-overlay",
		srcs: [
		"src/*/.java",
		":statslog-docsui-java-gen",
		],

		sdk_version: "system_current",
		@@ -153,13 +112,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/BaseActivity.java

+32 −44

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import com.android.documentsui.sidebar.RootsFragment;
		import com.android.documentsui.sorting.SortController;
		import com.android.documentsui.sorting.SortModel;

		import com.android.documentsui.util.VersionUtils;
		import com.google.android.material.appbar.AppBarLayout;

		import java.util.ArrayList;
		@@ -504,50 +503,39 @@ public abstract class BaseActivity
		@Override
		public boolean onOptionsItemSelected(MenuItem item) {

		switch (item.getItemId()) {
		case android.R.id.home:
		final int id = item.getItemId();
		if (id == android.R.id.home) {
		onBackPressed();
		return true;

		case R.id.option_menu_create_dir:
		} else if (id == R.id.option_menu_create_dir) {
		getInjector().actions.showCreateDirectoryDialog();
		return true;

		case R.id.option_menu_search:
		} else if (id == R.id.option_menu_search) {
		// SearchViewManager listens for this directly.
		return false;

		case R.id.option_menu_select_all:
		} else if (id == R.id.option_menu_select_all) {
		getInjector().actions.selectAllFiles();
		return true;

		case R.id.option_menu_debug:
		} else if (id == R.id.option_menu_debug) {
		getInjector().actions.showDebugMessage();
		return true;

		case R.id.option_menu_sort:
		} else if (id == R.id.option_menu_sort) {
		getInjector().actions.showSortDialog();
		return true;

		case R.id.option_menu_launcher:
		} else if (id == R.id.option_menu_launcher) {
		getInjector().actions.switchLauncherIcon();
		return true;

		case R.id.option_menu_show_hidden_files:
		} else if (id == R.id.option_menu_show_hidden_files) {
		onClickedShowHiddenFiles();
		return true;

		case R.id.sub_menu_grid:
		setViewMode(State.MODE_GRID);
		} else if (id == R.id.sub_menu_grid) {
		setViewMode(MODE_GRID);
		return true;

		case R.id.sub_menu_list:
		} else if (id == R.id.sub_menu_list) {
		setViewMode(State.MODE_LIST);
		return true;

		default:
		return super.onOptionsItemSelected(item);
		}
		return super.onOptionsItemSelected(item);
		}

		protected final @Nullable DirectoryFragment getDirectoryFragment() {