Snap for 13417833 from 67b1a972131edf4b582c28d44d18178a3f8877a6 to 25Q3-release (4d77ed23) · Commits · e / os / android_packages_apps_DocumentsUI

res/flag(com.android.documentsui.flags.use_material3)/drawable/ic_advanced_shortcut.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -19,14 +19,15 @@
		<background android:drawable="@color/shortcut_background" />
		<foreground>
		<inset android:inset="33%">
		<!-- from ic_root_smartphone.xml -->
		<vector
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		android:viewportWidth="960"
		android:viewportHeight="960">
		<path
		android:fillColor="@color/shortcut_foreground"
		android:pathData="M17 1.01L7 1c-1.1 0,-2 .9,-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2,-.9 2,-2V3c0,-1.1,-.9,-1.99,-2,-1.99zM17 19H7V5h10v14z"/>
		android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z"/>
		</vector>
		</inset>
		</foreground>

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		<item type="drawable" name="ic_sd_storage"/>
		<item type="drawable" name="ic_root_smartphone"/>
		<item type="drawable" name="root_list_selector"/>
		<item type="drawable" name="ic_advanced_shortcut"/>
		<!-- END DRAWABLE -->

		<!-- START BOOLEAN CONFIG -->

+6 −0

Original line number	Diff line number	Diff line
		@@ -608,6 +608,12 @@ public abstract class BaseActivity

		View rootsContainer = findViewById(getRes(R.id.container_roots));
		rootsContainer.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());

		View navRailContainer = findViewById(R.id.nav_rail_container_roots);
		if (navRailContainer != null) {
		navRailContainer.setPadding(
		0, 0, 0, insets.getSystemWindowInsetBottom());
		}
		}

		return insets.consumeSystemWindowInsets();

+8 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import androidx.recyclerview.widget.RecyclerView
		import com.android.documentsui.base.Menus
		import com.android.documentsui.services.FileOperationService
		import com.android.documentsui.services.FileOperationService.EXTRA_PROGRESS
		import com.android.documentsui.services.FileOperations
		import com.android.documentsui.services.Job
		import com.android.documentsui.services.JobProgress
		import com.android.documentsui.util.FormatUtils
		@@ -129,6 +130,7 @@ class JobPanelController(private val activityContext: Context) : BroadcastReceiv
		cancelButton.isVisible = expanded && !jobProgress.isFinal
		showInFolderButton.isVisible = expanded && jobProgress.isFinal
		dismissButton.isVisible = expanded && jobProgress.isFinal
		cancelButton.setOnClickListener { FileOperations.cancel(context, jobProgress.id) }
		dismissButton.setOnClickListener { controller.dismissProgress(jobProgress.id) }
		}

		@@ -367,8 +369,12 @@ class JobPanelController(private val activityContext: Context) : BroadcastReceiv

		for (jobProgress in progresses) {
		Log.d(TAG, "Received $jobProgress")
		currentJobs.merge(jobProgress.id, ProgressViewModel(jobProgress)) {
		old, new -> ProgressViewModel(new.jobProgress, old.expanded)
		if (jobProgress.state == Job.STATE_CANCELED) {
		currentJobs.remove(jobProgress.id)
		} else {
		currentJobs.merge(jobProgress.id, ProgressViewModel(jobProgress)) { old, new ->
		ProgressViewModel(new.jobProgress, old.expanded)
		}
		}
		}
		for ((jobProgress, _) in currentJobs.values) {

+6 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import static com.android.documentsui.services.FileOperationService.EXTRA_OPERAT
		import static com.android.documentsui.services.FileOperationService.MESSAGE_FINISH;
		import static com.android.documentsui.services.FileOperationService.MESSAGE_PROGRESS;
		import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
		import static com.android.documentsui.util.FlagUtils.isVisualSignalsFlagEnabled;
		import static com.android.documentsui.util.Material3Config.getRes;

		import android.app.Notification;
		@@ -1054,7 +1055,11 @@ class CopyJob extends ResolvedResourcesJob {
		}

		protected void update(Builder builder, Function<Long, String> messageFormatter) {
		// When the flag is enabled, updateEstimatedRemainingTime() is already called
		// elsewhere at the same time, so only call it when the flag is disabled.
		if (!isVisualSignalsFlagEnabled()) {
		updateEstimateRemainingTime();
		}
		final double completed = getProgress();

		builder.setProgress(100, (int) (completed * 100), false);