commit cf5d3c98d1da0b1cfd4976a6962e7244490bdc8d
author John Spurlock <jspurlock@google.com> Sun Sep 21 17:55:01 2014 -0400
committer John Spurlock <jspurlock@google.com> Sun Sep 21 18:00:01 2014 -0400
tree 64024e86e9fff087dd2e44ac530a410ff21cb036
parent c0f337ca7a75f70a9e44fc786931a9ab69be0769

Doze: Ensure a doze reset happens after leaving keyguard.

Bug:17536133
Change-Id: Ibc88a7f2c1a51656676fe62d4de8ab3ec4dd4081

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index c04ca83..80e9663 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1738,6 +1738,10 @@
         updateKeyguardStatusBarVisibility();
     }
 
+    public boolean isDozing() {
+        return mDozing;
+    }
+
     private static void setBackgroundColorAlpha(final View target, int rgb, int targetAlpha,
             boolean animate) {
         int currentAlpha = getBackgroundAlpha(target);

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 9d77331..90f9cdd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3641,7 +3641,7 @@
     }
 
     private void updateDozingState() {
-        if (mState != StatusBarState.KEYGUARD) {
+        if (mState != StatusBarState.KEYGUARD && !mNotificationPanel.isDozing()) {
             return;
         }
         mNotificationPanel.setDozing(mDozing);