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

am fd5494b8: Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev

Browse Source 
* commit 'fd5494b8ef91e8a909622c3bf45dac7537254b41':
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
This commit is contained in:
Daniel Sandler
2012-09-05 12:41:30 -07:00
committed by Android Git Automerger
parent ee2175c75b fd5494b8ef
commit 56f97a9b59
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -727,6 +727,10 @@ public class PhoneStatusBar extends BaseStatusBar {
*/
if (notification.notification.fullScreenIntent != null) {
// Stop screensaver if the notification has a full-screen intent.
// (like an incoming phone call)
awakenDreams();
// not immersive & a full-screen alert should be shown
Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent");
try {

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

@@ -151,8 +151,6 @@ public class NotificationManagerService extends INotificationManager.Stub
private AtomicFile mPolicyFile;
private HashSet<String> mBlockedPackages = new HashSet<String>();
private IDreamManager mSandman;
private static final int DB_VERSION = 1;
private static final String TAG_BODY = "notification-policy";
@@ -658,8 +656,6 @@ public class NotificationManagerService extends INotificationManager.Stub
void systemReady() {
mAudioService = IAudioService.Stub.asInterface(
ServiceManager.getService(Context.AUDIO_SERVICE));
mSandman = IDreamManager.Stub.asInterface(
ServiceManager.getService("dreams"));
// no beeping until we're basically done booting
mSystemReady = true;
@@ -995,16 +991,6 @@ public class NotificationManagerService extends INotificationManager.Stub
| Notification.FLAG_NO_CLEAR;
}
// Stop screensaver if the notification has a full-screen intent.
// (like an incoming phone call)
if (notification.fullScreenIntent != null && mSandman != null) {
try {
mSandman.awaken();
} catch (RemoteException e) {
// noop
}
}
if (notification.icon != 0) {
StatusBarNotification n = new StatusBarNotification(pkg, id, tag,
r.uid, r.initialPid, score, notification);
@@ -1047,6 +1033,7 @@ public class NotificationManagerService extends INotificationManager.Stub
if (((mDisabledNotifications & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) == 0)
&& (!(old != null
&& (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 ))
&& (r.userId == UserHandle.USER_ALL || r.userId == userId)
&& mSystemReady) {
final AudioManager audioManager = (AudioManager) mContext