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

am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev

Browse Source 
* commit 'cadf3969c313bd0e354157eef9e0bcc552cb0c8a':
  Notification for non-adopotable disks shouldn't be snoozed
This commit is contained in:
Makoto Onuki
2015-06-29 17:06:09 +00:00
committed by Android Git Automerger
parent f07db67724 cadf3969c3
commit 08dfa1b456
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
View File

@@ -318,11 +318,14 @@ public class StorageNotification extends SystemUI {
private Notification onVolumeMounted(VolumeInfo vol) { private Notification onVolumeMounted(VolumeInfo vol) {
final VolumeRecord rec = mStorageManager.findRecordByUuid(vol.getFsUuid()); final VolumeRecord rec = mStorageManager.findRecordByUuid(vol.getFsUuid());
// Don't annoy when user dismissed in past
if (rec.isSnoozed()) return null;
final DiskInfo disk = vol.getDisk(); final DiskInfo disk = vol.getDisk();
// Don't annoy when user dismissed in past. (But make sure the disk is adoptable; we
// used to allow snoozing non-adoptable disks too.)
if (rec.isSnoozed() && disk.isAdoptable()) {
return null;
}
if (disk.isAdoptable() && !rec.isInited()) { if (disk.isAdoptable() && !rec.isInited()) {
final CharSequence title = disk.getDescription(); final CharSequence title = disk.getDescription();
final CharSequence text = mContext.getString( final CharSequence text = mContext.getString(
@@ -346,7 +349,7 @@ public class StorageNotification extends SystemUI {
R.string.ext_media_ready_notification_message, disk.getDescription()); R.string.ext_media_ready_notification_message, disk.getDescription());
final PendingIntent browseIntent = buildBrowsePendingIntent(vol); final PendingIntent browseIntent = buildBrowsePendingIntent(vol);
return buildNotificationBuilder(vol, title, text) final Notification.Builder builder = buildNotificationBuilder(vol, title, text)
.addAction(new Action(R.drawable.ic_folder_24dp, .addAction(new Action(R.drawable.ic_folder_24dp,
mContext.getString(R.string.ext_media_browse_action), mContext.getString(R.string.ext_media_browse_action),
browseIntent)) browseIntent))
@@ -354,10 +357,14 @@ public class StorageNotification extends SystemUI {
mContext.getString(R.string.ext_media_unmount_action), mContext.getString(R.string.ext_media_unmount_action),
buildUnmountPendingIntent(vol))) buildUnmountPendingIntent(vol)))
.setContentIntent(browseIntent) .setContentIntent(browseIntent)
.setDeleteIntent(buildSnoozeIntent(vol.getFsUuid()))
.setCategory(Notification.CATEGORY_SYSTEM) .setCategory(Notification.CATEGORY_SYSTEM)
.setPriority(Notification.PRIORITY_LOW) .setPriority(Notification.PRIORITY_LOW);
.build(); // Non-adoptable disks can't be snoozed.
if (disk.isAdoptable()) {
builder.setDeleteIntent(buildSnoozeIntent(vol.getFsUuid()));
}
return builder.build();
} }
} }