Snap for 6796705 from b247fee1b65f1497e40f931962cd79e48e537c10 to sc-d1-release (20d28301) · Commits · e / os / android_packages_apps_DocumentsUI

res/drawable/launcher_screen.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		<item android:drawable="@android:color/white"/>

		<item
		android:drawable="@drawable/app_icon"
		android:drawable="@drawable/splash_screen"
		android:height="150dp"
		android:width="150dp"
		android:gravity="center"/>

res/drawable/launcher_screen_night.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		<item android:drawable="@color/app_background_color"/>

		<item
		android:drawable="@drawable/app_icon"
		android:drawable="@drawable/splash_screen"
		android:height="150dp"
		android:width="150dp"
		android:gravity="center"/>

res/drawable/splash_screen.xml

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
		android:fillColor="#4285F4"/>
		<path
		android:pathData="M23,12c0,6.1 -4.9,11 -11,11S1,18.1 1,12c0,0 0,0 0,-0.1c0,6 4.9,10.9 11,10.9S23,18 23,12C23,12 23,12 23,12z"
		android:strokeAlpha="0.2"
		android:fillColor="#263238"
		android:fillAlpha="0.2"/>
		<path
		android:pathData="M23,12C23,12 23,12 23,12c0,-6 -4.9,-10.9 -11,-10.9S1,6 1,12.1c0,0 0,0 0,-0.1C1,5.9 5.9,1 12,1S23,5.9 23,12z"
		android:strokeAlpha="0.2"
		android:fillColor="#FFFFFF"
		android:fillAlpha="0.2"/>
		<path
		android:pathData="M22.8,14.2c-1,4.8 -5,8.4 -9.9,8.8l-6.4,-6.4L17.6,9C17.6,9 22.8,14.2 22.8,14.2z"
		android:fillColor="#4285F4"/>
		<path
		android:pathData="M22.8,14.2c-1,4.8 -5,8.4 -9.9,8.8l-6.4,-6.4L17.6,9C17.6,9 22.8,14.2 22.8,14.2z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startY="12.203438"
		android:startX="11.452812"
		android:endY="20.219812"
		android:endX="19.469187"
		android:type="linear">
		<item android:offset="0" android:color="#33263238"/>
		<item android:offset="1" android:color="#05263238"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M16.5,8.5H12L10.8,7H7.5C6.7,7 6,7.7 6,8.5v7C6,16.3 6.7,17 7.5,17h9c0.8,0 1.5,-0.7 1.5,-1.5V10C18,9.2 17.3,8.5 16.5,8.5z"
		android:fillColor="#F5F5F5"/>
		<path
		android:pathData="M18,10v0.1c0,-0.8 -0.7,-1.5 -1.5,-1.5H12l-1.2,-1.5H7.5C6.7,7.1 6,7.8 6,8.6V8.5C6,7.7 6.7,7 7.5,7h3.2L12,8.5h4.5C17.3,8.5 18,9.2 18,10z"
		android:strokeAlpha="0.4"
		android:fillColor="#FFFFFF"
		android:fillAlpha="0.4"/>
		<path
		android:pathData="M18,15.5v0.1c0,0.8 -0.7,1.5 -1.5,1.5h-9c-0.8,0 -1.5,-0.7 -1.5,-1.5v-0.1C6,16.3 6.7,17 7.5,17h9C17.3,17 18,16.3 18,15.5z"
		android:strokeAlpha="0.2"
		android:fillColor="#263238"
		android:fillAlpha="0.2"/>
		<path
		android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
		android:fillAlpha="0.1">
		<aapt:attr name="android:fillColor">
		<gradient
		android:gradientRadius="22.333876"
		android:centerX="3.238875"
		android:centerY="5.0445"
		android:type="radial">
		<item android:offset="0" android:color="#FFFFFFFF"/>
		<item android:offset="1" android:color="#00FFFFFF"/>
		</gradient>
		</aapt:attr>
		</path>
		</vector>

src/com/android/documentsui/queries/SearchChipViewManager.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.documentsui.MetricConsts;
		import com.android.documentsui.R;
		import com.android.documentsui.base.MimeTypes;
		import com.android.documentsui.base.Shared;
		import com.android.documentsui.util.VersionUtils;

		import com.google.android.material.chip.Chip;
		import com.google.common.primitives.Ints;
		@@ -96,9 +97,11 @@ public class SearchChipViewManager {
		static {
		sMimeTypesChipItems.put(TYPE_IMAGES,
		new SearchChipData(TYPE_IMAGES, R.string.chip_title_images, IMAGES_MIMETYPES));
		if (VersionUtils.isAtLeastR()) {
		sMimeTypesChipItems.put(TYPE_DOCUMENTS,
		new SearchChipData(TYPE_DOCUMENTS, R.string.chip_title_documents,
		DOCUMENTS_MIMETYPES));
		}
		sMimeTypesChipItems.put(TYPE_AUDIO,
		new SearchChipData(TYPE_AUDIO, R.string.chip_title_audio, AUDIO_MIMETYPES));
		sMimeTypesChipItems.put(TYPE_VIDEOS,

src/com/android/documentsui/services/CompressJob.java

+16 −6

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.documentsui.services;

		import static android.content.ContentResolver.wrap;

		import static com.android.documentsui.services.FileOperationService.OPERATION_MOVE;

		import android.app.Notification;
		@@ -45,6 +47,8 @@ final class CompressJob extends CopyJob {
		private static final String TAG = "CompressJob";
		private static final String NEW_ARCHIVE_EXTENSION = ".zip";

		private Uri mArchiveUri;

		/**
		* Moves files to a destination identified by {@code destination}.
		* Performs most work by delegating to CopyJob, then deleting
		@@ -99,17 +103,16 @@ final class CompressJob extends CopyJob {
		displayName = service.getString(R.string.new_archive_file_name, NEW_ARCHIVE_EXTENSION);
		}

		Uri archiveUri;
		try {
		archiveUri = DocumentsContract.createDocument(
		mArchiveUri = DocumentsContract.createDocument(
		resolver, mDstInfo.derivedUri, "application/zip", displayName);
		} catch (Exception e) {
		archiveUri = null;
		mArchiveUri = null;
		}

		try {
		mDstInfo = DocumentInfo.fromUri(resolver, ArchivesProvider.buildUriForArchive(
		archiveUri, ParcelFileDescriptor.MODE_WRITE_ONLY), UserId.DEFAULT_USER);
		mArchiveUri, ParcelFileDescriptor.MODE_WRITE_ONLY), UserId.DEFAULT_USER);
		ArchivesProvider.acquireArchive(getClient(mDstInfo), mDstInfo.derivedUri);
		} catch (FileNotFoundException e) {
		Log.e(TAG, "Failed to create dstInfo.", e);
		@@ -132,7 +135,14 @@ final class CompressJob extends CopyJob {
		Log.e(TAG, "Failed to release the archive.");
		}

		// TODO: Remove the archive file in case of an error.
		// Remove the archive file in case of an error.
		try {
		if (!isFinished() \|\| isCanceled()) {
		DocumentsContract.deleteDocument(wrap(getClient(mArchiveUri)), mArchiveUri);
		}
		} catch (RemoteException \| FileNotFoundException e) {
		Log.w(TAG, "Failed to cleanup after compress error: " + mDstInfo.toString(), e);
		}

		super.finish();
		}