ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Make "security required" notification ongoing"

Browse Source
This commit is contained in:
Marc Blank 2011-08-01 14:20:11 -07:00 committed by Android (Google) Code Review
commit b6e2bd85a4
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/email/NotificationController.java
View File

@ -133,6 +133,17 @@ public class NotificationController {
return sInstance; return sInstance;
} }
/**
* Return whether or not a notification, based on the passed-in id, needs to be "ongoing"
* @param notificationId the notification id to check
* @return whether or not the notification must be "ongoing"
*/
private boolean needsOngoingNotification(int notificationId) {
// "Security needed" must be ongoing so that the user doesn't close it; otherwise, sync will
// be prevented until a reboot. Consider also doing this for password expired.
return notificationId == NOTIFICATION_ID_SECURITY_NEEDED;
}
/** /**
* Returns a {@link Notification} for an event with the given account. The account contains * Returns a {@link Notification} for an event with the given account. The account contains
* specific rules on ring tone usage and these will be used to modify the notification * specific rules on ring tone usage and these will be used to modify the notification
@ -152,7 +163,7 @@ public class NotificationController {
*/ */
private Notification createAccountNotification(Account account, String ticker, private Notification createAccountNotification(Account account, String ticker,
CharSequence title, String contentText, Intent intent, Bitmap largeIcon, CharSequence title, String contentText, Intent intent, Bitmap largeIcon,
Integer number, boolean enableAudio) { Integer number, boolean enableAudio, boolean ongoing) {
// Pending Intent // Pending Intent
PendingIntent pending = null; PendingIntent pending = null;
if (intent != null) { if (intent != null) {
@ -169,7 +180,8 @@ public class NotificationController {
.setNumber(number == null ? 0 : number) .setNumber(number == null ? 0 : number)
.setSmallIcon(R.drawable.stat_notify_email_generic) .setSmallIcon(R.drawable.stat_notify_email_generic)
.setWhen(mClock.getTime()) .setWhen(mClock.getTime())
.setTicker(ticker); .setTicker(ticker)
.setOngoing(ongoing);
if (enableAudio) { if (enableAudio) {
setupSoundAndVibration(builder, account); setupSoundAndVibration(builder, account);
@ -192,7 +204,7 @@ public class NotificationController {
private void showAccountNotification(Account account, String ticker, String title, private void showAccountNotification(Account account, String ticker, String title,
String contentText, Intent intent, int notificationId) { String contentText, Intent intent, int notificationId) {
Notification notification = createAccountNotification(account, ticker, title, contentText, Notification notification = createAccountNotification(account, ticker, title, contentText,
intent, null, null, true); intent, null, null, true, needsOngoingNotification(notificationId));
mNotificationManager.notify(notificationId, notification); mNotificationManager.notify(notificationId, notification);
} }
@ -431,7 +443,7 @@ public class NotificationController {
boolean enableAudio = (now - mLastMessageNotifyTime) > MIN_SOUND_INTERVAL_MS; boolean enableAudio = (now - mLastMessageNotifyTime) > MIN_SOUND_INTERVAL_MS;
Notification notification = createAccountNotification( Notification notification = createAccountNotification(
account, title.toString(), title, text, account, title.toString(), title, text,
intent, largeIcon, number, enableAudio); intent, largeIcon, number, enableAudio, false);
mLastMessageNotifyTime = now; mLastMessageNotifyTime = now;
return notification; return notification;
} }