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

resolved conflicts for merge of 9b7dba93 to eclair-mr2

Browse Source 
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
This commit is contained in:
Mike Lockwood
2009-12-02 19:57:33 -05:00
parent 2d8b0c3f0f 9b7dba936c
commit f72fb68bf3
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,11 @@ class NotificationManagerService extends INotificationManager.Stub
private NotificationRecord mVibrateNotification;
private Vibrator mVibrator = new Vibrator();
// adb
// for enabling and disabling notification pulse behavior
private boolean mScreenOn = true;
private boolean mNotificationPulseEnabled;
// for adb connected notifications
private boolean mUsbConnected;
private boolean mAdbEnabled = false;
private boolean mAdbNotificationShown = false;
@@ -336,6 +340,12 @@ class NotificationManagerService extends INotificationManager.Stub
return;
}
cancelAllNotificationsInt(pkgName, 0, 0);
} else if (action.equals(Intent.ACTION_SCREEN_ON)) {
mScreenOn = true;
updateNotificationPulse();
} else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
mScreenOn = false;
updateNotificationPulse();
}
}
};
@@ -349,6 +359,8 @@ class NotificationManagerService extends INotificationManager.Stub
ContentResolver resolver = mContext.getContentResolver();
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.ADB_ENABLED), false, this);
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.NOTIFICATION_LIGHT_PULSE), false, this);
update();
}
@@ -358,13 +370,21 @@ class NotificationManagerService extends INotificationManager.Stub
public void update() {
ContentResolver resolver = mContext.getContentResolver();
mAdbEnabled = Settings.Secure.getInt(resolver,
boolean adbEnabled = Settings.Secure.getInt(resolver,
Settings.Secure.ADB_ENABLED, 0) != 0;
updateAdbNotification();
if (mAdbEnabled != adbEnabled) {
mAdbEnabled = adbEnabled;
updateAdbNotification();
}
boolean pulseEnabled = Settings.System.getInt(resolver,
Settings.System.NOTIFICATION_LIGHT_PULSE, 0) != 0;
if (mNotificationPulseEnabled != pulseEnabled) {
mNotificationPulseEnabled = pulseEnabled;
updateNotificationPulse();
}
}
}
private final SettingsObserver mSettingsObserver;
NotificationManagerService(Context context, StatusBarService statusBar,
LightsService lights)
{
@@ -399,10 +419,12 @@ class NotificationManagerService extends INotificationManager.Stub
filter.addAction(Intent.ACTION_UMS_DISCONNECTED);
filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
filter.addAction(Intent.ACTION_SCREEN_ON);
filter.addAction(Intent.ACTION_SCREEN_OFF);
mContext.registerReceiver(mIntentReceiver, filter);
mSettingsObserver = new SettingsObserver(mHandler);
mSettingsObserver.observe();
SettingsObserver observer = new SettingsObserver(mHandler);
observer.observe();
}
void systemReady() {
@@ -1005,7 +1027,9 @@ class NotificationManagerService extends INotificationManager.Stub
mLedNotification = mLights.get(n-1);
}
}
if (mLedNotification == null) {
// we only flash if screen is off and persistent pulsing is enabled
if (mLedNotification == null || mScreenOn || !mNotificationPulseEnabled) {
mNotificationLight.turnOff();
} else {
mNotificationLight.setFlashing(
@@ -1097,7 +1121,13 @@ class NotificationManagerService extends INotificationManager.Stub
}
}
}
private void updateNotificationPulse() {
synchronized (mNotificationList) {
updateLightsLocked();
}
}
// ======================================================================
@Override
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {