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

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

+2 −2

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

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

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

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