diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-04-19 06:16:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-19 06:17:00 +0000 |
| commit | d709e4118a9de00707f454552465ab5b49c56664 (patch) | |
| tree | 4fbef8cddcff827dd317715905c5c534c8062724 /core/java/android | |
| parent | 2314b47b1116806a032c9eb27ee139c33f8dba12 (diff) | |
| parent | e6c04f9417cc4bff0f5f9e72f0d6d66d2aab6e80 (diff) | |
Merge "Broadcast hidden volumes, notification polish."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/storage/DiskInfo.java | 22 | ||||
| -rw-r--r-- | core/java/android/os/storage/VolumeInfo.java | 5 |
2 files changed, 20 insertions, 7 deletions
diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java index 2f63988c4e44..9f38de8e346d 100644 --- a/core/java/android/os/storage/DiskInfo.java +++ b/core/java/android/os/storage/DiskInfo.java @@ -64,19 +64,29 @@ public class DiskInfo implements Parcelable { return id; } + private boolean isInteresting(String label) { + if (TextUtils.isEmpty(label)) { + return false; + } + if (label.toLowerCase().contains("generic")) { + return false; + } + return true; + } + public String getDescription() { final Resources res = Resources.getSystem(); if ((flags & FLAG_SD) != 0) { - if (TextUtils.isEmpty(label)) { - return res.getString(com.android.internal.R.string.storage_sd_card); - } else { + if (isInteresting(label)) { return res.getString(com.android.internal.R.string.storage_sd_card_label, label); + } else { + return res.getString(com.android.internal.R.string.storage_sd_card); } } else if ((flags & FLAG_USB) != 0) { - if (TextUtils.isEmpty(label)) { - return res.getString(com.android.internal.R.string.storage_usb_drive); - } else { + if (isInteresting(label)) { return res.getString(com.android.internal.R.string.storage_usb_drive_label, label); + } else { + return res.getString(com.android.internal.R.string.storage_usb_drive); } } else { return null; diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 375a86a9f983..f3498d55c779 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -49,7 +49,10 @@ import java.util.Objects; * @hide */ public class VolumeInfo implements Parcelable { - public static final String EXTRA_VOLUME_ID = "android.os.storage.extra.VOLUME_ID"; + public static final String ACTION_VOLUME_STATE_CHANGED = + "android.os.storage.action.VOLUME_STATE_CHANGED"; + public static final String EXTRA_VOLUME_ID = + "android.os.storage.extra.VOLUME_ID"; /** Stub volume representing internal private storage */ public static final String ID_PRIVATE_INTERNAL = "private"; |