Merge "DocsUI, Search]: Search dropdown notifications." into main (410f4e5a) · Commits · e / os / android_packages_apps_DocumentsUI

proguard.flags

+3 −1

Original line number	Diff line number	Diff line
		@@ -192,6 +192,8 @@
		int rename_error;
		int search_bar_hint;
		int share_via;
		int search_last_modified_30_days;
		int search_location_everywhere;
		int sort_dimension_date;
		int sort_dimension_file_type;
		int sort_dimension_name;

res/flag(com.android.documentsui.flags.use_material3)/menu/search_file_type_menu.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,13 +17,18 @@
		<!-- Dropdown menu showing possible file type options (any type, documents, audio, etc.) -->
		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@+id/file_type_all_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_file_type_all" />
		<item android:id="@+id/file_type_audio_option"
		android:icon="@drawable/ic_done"
		android:title="@string/chip_title_audio" />
		<item android:id="@+id/file_type_documents_option"
		android:icon="@drawable/ic_done"
		android:title="@string/chip_title_documents" />
		<item android:id="@+id/file_type_images_option"
		android:icon="@drawable/ic_done"
		android:title="@string/chip_title_images" />
		<item android:id="@+id/file_type_videos_option"
		android:icon="@drawable/ic_done"
		android:title="@string/chip_title_videos" />
		</menu>

res/flag(com.android.documentsui.flags.use_material3)/menu/search_last_modified_menu.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -17,15 +17,21 @@
		<!-- Dropdown menu showing possible limits on the last modified values. -->
		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@+id/last_modified_any_time_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_any_time" />
		<item android:id="@+id/last_modified_1_day_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_1_day" />
		<item android:id="@+id/last_modified_2_days_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_2_days" />
		<item android:id="@+id/last_modified_7_days_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_7_days" />
		<item android:id="@+id/last_modified_30_days_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_30_days" />
		<item android:id="@+id/last_modified_365_days_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_last_modified_365_days" />
		</menu>

res/flag(com.android.documentsui.flags.use_material3)/menu/search_location_menu.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,9 +17,12 @@
		<!-- Dropdown menu showing possible search locations (this folder, root folder, everywhere). -->
		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@+id/everywhere_options"
		android:icon="@drawable/ic_done"
		android:title="@string/search_location_everywhere" />
		<item android:id="@+id/root_folder_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_location_root_folder" />
		<item android:id="@+id/this_folder_option"
		android:icon="@drawable/ic_done"
		android:title="@string/search_location_this_folder" />
		</menu>
		No newline at end of file

src/com/android/documentsui/AbstractActionHandler.java

+4 −15

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ import java.util.concurrent.ExecutorService;
		import java.util.concurrent.Executors;
		import java.util.concurrent.Semaphore;
		import java.util.function.Consumer;
		import java.util.stream.Collectors;

		import javax.annotation.Nullable;

		@@ -1009,13 +1008,13 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
		mExecutorService = Executors.newFixedThreadPool(
		GlobalSearchLoader.MAX_OUTSTANDING_TASK);
		}
		DocumentStack stack = mState.stack;
		RootInfo root = stack.getRoot();
		List<UserId> userIdList = DocumentsApplication.getUserIdManager(mActivity).getUserIds();

		DocumentStack stack = mState.stack;
		Duration lastModifiedDelta = stack.isRecents()
		? Duration.ofMillis(RecentsLoader.REJECT_OLDER_THAN)
		: null;
		RootInfo root = stack.getRoot();
		int maxResults = (root == null \|\| root.isRecents())
		? RecentsLoader.MAX_DOCS_FROM_ROOT : MAX_RESULTS;
		QueryOptions options = new QueryOptions(
		@@ -1028,22 +1027,13 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
		// one of the searched content providers reports a change.
		final LockingContentObserver observer = new LockingContentObserver(
		mContentLock, AbstractActionHandler.this::loadDocumentsForCurrentStack);
		Collection<RootInfo> rootList = new ArrayList<>();
		if (stack.isRecents()) {
		// TODO(b:381346575): Pass roots based on user selection.
		rootList.addAll(mProviders.getMatchingRootsBlocking(mState).stream()
		.filter(r -> r.supportsSearch() && r.authority != null
		&& r.rootId != null)
		.collect(Collectors.toList()));
		} else {
		rootList.add(root);
		}
		Collection<RootInfo> roots = mProviders.getMatchingRootsBlocking(mState);
		return new SearchLoader(
		mActivity,
		userIdList,
		mInjector.fileTypeLookup,
		observer,
		rootList,
		mSearchMgr.getSearchFolders(roots, stack),
		mSearchMgr.getCurrentSearch(),
		options,
		mState.sortModel,
		@@ -1064,7 +1054,6 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
		options,
		mState.sortModel
		);

		}

		@Override