am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev

* commit '391232da084d715b9f20539a98b4a49cc56bf949':
  Log the state of the notification shade
This commit is contained in:
Christoph Studer
2014-12-04 18:15:03 +00:00
committed by Android Git Automerger
2 changed files with 14 additions and 8 deletions

View File

@@ -9,6 +9,7 @@ option java_package com.android.systemui;
36001 sysui_heads_up_status (key|3),(visible|1)
36002 sysui_fullscreen_notification (key|3)
36003 sysui_heads_up_escalation (key|3)
36004 sysui_status_bar_state (state|1)
# ---------------------------
# PhoneStatusBarView.java

View File

@@ -3795,14 +3795,19 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
* @param state The {@link StatusBarState} to set.
*/
public void setBarState(int state) {
// If we're visible and switched to SHADE_LOCKED (the user dragged down
// on the lockscreen), clear notification LED, vibration, ringing.
// Other transitions are covered in handleVisibleToUserChanged().
if (mVisible && mState != state && state == StatusBarState.SHADE_LOCKED) {
try {
mBarService.clearNotificationEffects();
} catch (RemoteException e) {
// Ignore.
if (state != mState) {
EventLogTags.writeSysuiStatusBarState(state);
// If we're visible and switched to SHADE_LOCKED (the user dragged
// down on the lockscreen), clear notification LED, vibration,
// ringing.
// Other transitions are covered in handleVisibleToUserChanged().
if (mVisible && state == StatusBarState.SHADE_LOCKED) {
try {
mBarService.clearNotificationEffects();
} catch (RemoteException e) {
// Ignore.
}
}
}
mState = state;