Merge "Log the state of the notification shade" into lmp-mr1-dev (391232da) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/EventLogTags.logtags

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

+13 −8

Original line number	Diff line number	Diff line
		@@ -3795,16 +3795,21 @@ 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.
		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 && mState != state && state == StatusBarState.SHADE_LOCKED) {
		if (mVisible && state == StatusBarState.SHADE_LOCKED) {
		try {
		mBarService.clearNotificationEffects();
		} catch (RemoteException e) {
		// Ignore.
		}
		}
		}
		mState = state;
		mStatusBarWindowManager.setStatusBarState(state);
		}