Merge "Update storage wizard to latest UX mocks." into pi-dev am: daafeb35a1
am: 3847ad028a
Change-Id: I3095c525869754c9f9d8f447ffcd5352647312e7
diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java
index 9114107..d493cce 100644
--- a/core/java/android/os/storage/DiskInfo.java
+++ b/core/java/android/os/storage/DiskInfo.java
@@ -17,6 +17,7 @@
package android.os.storage;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.res.Resources;
import android.os.Parcel;
import android.os.Parcelable;
@@ -93,7 +94,7 @@
return true;
}
- public String getDescription() {
+ public @Nullable String getDescription() {
final Resources res = Resources.getSystem();
if ((flags & FLAG_SD) != 0) {
if (isInteresting(label)) {
@@ -112,6 +113,17 @@
}
}
+ public @Nullable String getShortDescription() {
+ final Resources res = Resources.getSystem();
+ if (isSd()) {
+ return res.getString(com.android.internal.R.string.storage_sd_card);
+ } else if (isUsb()) {
+ return res.getString(com.android.internal.R.string.storage_usb_drive);
+ } else {
+ return null;
+ }
+ }
+
public boolean isAdoptable() {
return (flags & FLAG_ADOPTABLE) != 0;
}
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 739b716..99711d0 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -5583,6 +5583,11 @@
// OS: P
SETTINGS_GESTURE_SWIPE_UP = 1374;
+ // OPEN: Settings > Storage > Dialog to format a storage volume
+ // CATEGORY: SETTINGS
+ // OS: P
+ DIALOG_VOLUME_FORMAT = 1375;
+
// ---- End P Constants, all P constants go above this line ----
// First Q constant in master goes here: