From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Mon, 7 Aug 2017 12:53:50 +0000 (+0000)
Subject: Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
X-Git-Tag: android-x86-8.1-r1~118^2~5^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=81e3b48f9c63760b1a772b50e6df89b89ccce779;p=android-x86%2Fframeworks-base.git

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
---

81e3b48f9c63760b1a772b50e6df89b89ccce779
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 3913254aab23,5baa7ff4a633..7e61a80de748
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@@ -201,10 -223,10 +223,10 @@@ public class StatusBarKeyguardViewManag
       */
      public void reset(boolean hideBouncerWhenShowing) {
          if (mShowing) {
 -            if (mOccluded) {
 +            if (mOccluded && !mDozing) {
                  mStatusBar.hideKeyguard();
                  mStatusBar.stopWaitingForKeyguardExit();
-                 mBouncer.hide(false /* destroyView */);
+                 hideBouncer(false /* destroyView */);
              } else {
                  showBouncerOrKeyguard(hideBouncerWhenShowing);
              }