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

Merge "Dismiss migration notification when wizard done." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-06-16 22:31:27 +00:00
committed by Android (Google) Code Review
parent 2ce8daacac df27d3bf30
commit fd0475702b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ public class StorageNotification extends SystemUI {
private static final int MOVE_ID = 0x534d4f56; // SMOV private static final int MOVE_ID = 0x534d4f56; // SMOV
private static final String ACTION_SNOOZE_VOLUME = "com.android.systemui.action.SNOOZE_VOLUME"; private static final String ACTION_SNOOZE_VOLUME = "com.android.systemui.action.SNOOZE_VOLUME";
private static final String ACTION_FINISH_WIZARD = "com.android.systemui.action.FINISH_WIZARD";
// TODO: delay some notifications to avoid bumpy fast operations // TODO: delay some notifications to avoid bumpy fast operations
@@ -107,6 +108,15 @@ public class StorageNotification extends SystemUI {
} }
}; };
private final BroadcastReceiver mFinishReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// When finishing the adoption wizard, clean up any notifications
// for moving primary storage
mNotificationManager.cancelAsUser(null, MOVE_ID, UserHandle.ALL);
}
};
private final MoveCallback mMoveCallback = new MoveCallback() { private final MoveCallback mMoveCallback = new MoveCallback() {
@Override @Override
public void onCreated(int moveId, Bundle extras) { public void onCreated(int moveId, Bundle extras) {
@@ -146,6 +156,8 @@ public class StorageNotification extends SystemUI {
mContext.registerReceiver(mSnoozeReceiver, new IntentFilter(ACTION_SNOOZE_VOLUME), mContext.registerReceiver(mSnoozeReceiver, new IntentFilter(ACTION_SNOOZE_VOLUME),
android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS, null); android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS, null);
mContext.registerReceiver(mFinishReceiver, new IntentFilter(ACTION_FINISH_WIZARD),
android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS, null);
// Kick current state into place // Kick current state into place
final List<DiskInfo> disks = mStorageManager.getDisks(); final List<DiskInfo> disks = mStorageManager.getDisks();