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

Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2017-07-27 21:09:09 +00:00
committed by Android (Google) Code Review
parent 153d2ff613 3bad9a6caf
commit 02be5d1ddd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
} }