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

am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread

Browse Source 
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'

* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
  Only pulse notification light if a new notification has been received since the screen was last turned off
This commit is contained in:
Mike Lockwood
2010-09-09 16:10:00 -07:00
committed by Android Git Automerger
parent ecad4545d5 91cf049f34
commit dc936251c4
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/NotificationManagerService.java
View File

@@ -113,6 +113,10 @@ public class NotificationManagerService extends INotificationManager.Stub
private boolean mScreenOn = true;
private boolean mInCall = false;
private boolean mNotificationPulseEnabled;
// This is true if we have received a new notification while the screen is off
// (that is, if mLedNotification was set while the screen was off)
// This is reset to false when the screen is turned on.
private boolean mPendingPulseNotification;
// for adb connected notifications
private boolean mAdbNotificationShown = false;
@@ -1098,6 +1102,11 @@ public class NotificationManagerService extends INotificationManager.Stub
mBatteryLight.turnOff();
}
// clear pending pulse notification if screen is on
if (mScreenOn || mLedNotification == null) {
mPendingPulseNotification = false;
}
// handle notification lights
if (mLedNotification == null) {
// get next notification, if any
@@ -1105,11 +1114,14 @@ public class NotificationManagerService extends INotificationManager.Stub
if (n > 0) {
mLedNotification = mLights.get(n-1);
}
if (mLedNotification != null && !mScreenOn) {
mPendingPulseNotification = true;
}
}
// we only flash if screen is off and persistent pulsing is enabled
// and we are not currently in a call
if (mLedNotification == null || mScreenOn || mInCall) {
if (!mPendingPulseNotification || mScreenOn || mInCall) {
mNotificationLight.turnOff();
} else {
int ledARGB = mLedNotification.notification.ledARGB;