Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev (a385f7d2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3720,7 +3720,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}
		else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
		notifyHeadsUpScreenOff();
		finishBarAnimations();
		resetUserExpandedStates();
		}
		@@ -5162,6 +5161,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		@Override
		public void onStartedGoingToSleep() {
		notifyHeadsUpGoingToSleep();
		dismissVolumeDialog();
		}

		@@ -7254,7 +7254,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		setAreThereNotifications();
		}

		protected void notifyHeadsUpScreenOff() {
		protected void notifyHeadsUpGoingToSleep() {
		maybeEscalateHeadsUp();
		}