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

am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev

Browse Source 
* commit 'd613437ba4eb18c12135295fc743e37011fb2f9b':
  Doze: Ensure a doze reset happens after leaving keyguard.
This commit is contained in:
John Spurlock
2014-09-22 19:31:46 +00:00
committed by Android Git Automerger
parent 6c55dfc8cd 453b35e2c4
commit 5f60e02208
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1738,6 +1738,10 @@ public class NotificationPanelView extends PanelView implements
updateKeyguardStatusBarVisibility();
}
public boolean isDozing() {
return mDozing;
}
private static void setBackgroundColorAlpha(final View target, int rgb, int targetAlpha,
boolean animate) {
int currentAlpha = getBackgroundAlpha(target);

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -3641,7 +3641,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
private void updateDozingState() {
if (mState != StatusBarState.KEYGUARD) {
if (mState != StatusBarState.KEYGUARD && !mNotificationPanel.isDozing()) {
return;
}
mNotificationPanel.setDozing(mDozing);