Snap for 13592639 from 3b125ac196a3382e6542c1ee78ce46be91bac52f to 25Q3-release (256b3418) · Commits · e / os / android_packages_apps_DocumentsUI

res/values-de/inspector_strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="inspector_title" msgid="1924760928091740238">"Informationen"</string>
		<string name="inspector_load_error" msgid="7522190243413249291">"Dateiinformationen konnten nicht geladen werden"</string>
		<string name="inspector_load_error" msgid="7522190243413249291">"Datei-Informationen konnten nicht geladen werden"</string>
		<string name="inspector_debug_section" msgid="2576052661505700421">"Infos zur Fehlersuche (nur für Entwickler)"</string>
		<string name="inspector_debug_metadata_section" msgid="5875140675600744846">"Unkomprimierte Metadaten: <xliff:g id="METADATATYPE">%1$s</xliff:g>"</string>
		<string name="inspector_metadata_section" msgid="6077622515328240575">"Mediendetails"</string>

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -419,6 +419,10 @@
		=1 {Copying <xliff:g id="filename" example="foobar.txt">{filename}</xliff:g> to <xliff:g id="directory" example="example folder">{directory}</xliff:g>}
		other {Copying # files to <xliff:g id="directory" example="example folder">{directory}</xliff:g>}
		}</string>
		<string name="extract_in_progress" translatable="false">{count, plural,
		=1 {Extracting \u201C<xliff:g id="filename" example="foobar.txt">{filename}</xliff:g>\u201D to \u201C<xliff:g id="directory" example="example folder">{directory}</xliff:g>\u201D}
		other {Extracting # archives to \u201C<xliff:g id="directory" example="example folder">{directory}</xliff:g>\u201D}
		}</string>
		<string name="move_in_progress" translatable="false">{count, plural,
		=1 {Moving <xliff:g id="filename" example="foobar.txt">{filename}</xliff:g> to <xliff:g id="directory" example="example folder">{directory}</xliff:g>}
		other {Moving # files to <xliff:g id="directory" example="example folder">{directory}</xliff:g>}

src/com/android/documentsui/archives/ReadableArchive.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;

		import static com.android.documentsui.base.SharedMinimal.DEBUG;

		import static java.util.Collections.unmodifiableList;

		import android.content.Context;
		import android.content.res.AssetFileDescriptor;
		import android.graphics.Point;
		@@ -64,6 +66,8 @@ import java.util.Stack;
		public class ReadableArchive extends Archive {
		private static final String TAG = "ReadableArchive";

		// All the archive entries, in the order they are listed in the archive.
		private final List<ArchiveEntry> mAllEntries = new ArrayList<>();
		private final StorageManager mStorageManager;
		private final ArchiveHandle mArchiveHandle;
		private final ParcelFileDescriptor mParcelFileDescriptor;
		@@ -98,6 +102,8 @@ public class ReadableArchive extends Archive {
		final Stack<ArchiveEntry> stack = new Stack<>();
		while (it.hasMoreElements()) {
		entry = it.nextElement();
		mAllEntries.add(entry);

		if (entry.isDirectory() != entry.getName().endsWith("/")) {
		if (DEBUG) {
		Log.d(TAG, "directory entry doesn't end with /");
		@@ -342,6 +348,20 @@ public class ReadableArchive extends Archive {
		openDocument(documentId, "r", signal), 0, entry.getSize(), null);
		}

		/**
		* Gets the unmodifiable list of all the entries of this archive, in the original order they are
		* stored in the archive.
		*/
		public List<ArchiveEntry> getEntries() {
		return unmodifiableList(mAllEntries);
		}

		/** Gets an InputStream for reading the contents of the given entry. */
		public @NonNull InputStream getInputStream(@NonNull ArchiveEntry entry)
		throws IOException, CompressorException, ArchiveException {
		return mArchiveHandle.getInputStream(entry);
		}

		/**
		* Closes an archive.
		*

src/com/android/documentsui/dirlist/DirectoryFragment.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -1104,8 +1104,10 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		// Need to plum down into handling the way we do with deleteDocuments.
		closeSelectionBar();
		return true;

		// TODO: Implement extract (to the current directory).
		} else if (isZipNgFlagEnabled() && id == getRes(R.id.dir_menu_extract_here)) {
		transferDocuments(selection, mState.stack, FileOperationService.OPERATION_UNPACK);
		closeSelectionBar();
		return true;
		} else if (id == getRes(R.id.action_menu_extract_to)
		\|\| id == getRes(R.id.option_menu_extract_all)) {
		transferDocuments(selection, null, FileOperationService.OPERATION_EXTRACT);

src/com/android/documentsui/files/ActionHandler.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -614,9 +614,11 @@ public class ActionHandler<T extends FragmentActivity & AbstractActionHandler.Co
		}

		private void showPeek(DocumentInfo doc) {
		if (mPeekViewManager != null) {
		mPeekViewManager.peekDocument(doc);
		if (mPeekViewManager == null) {
		Log.e(TAG, "Attempting to show Peek when PeekViewManager is not defined");
		return;
		}
		mPeekViewManager.peekDocument(doc);
		}

		@Override