Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update storage wizard to latest UX mocks." into pi-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2018-04-09 23:58:34 +00:00
committed by Android (Google) Code Review
parent 75f9459c21 4627071291
commit daafeb35a1
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/os/storage/DiskInfo.java
View File

@@ -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 @@ public class DiskInfo implements Parcelable {
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 class DiskInfo implements Parcelable {
}
}
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;
}