Merge "[Bouncer] reset bouncer visibility with doze state." into tm-qpr-dev

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

@@ -667,9 +667,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     private void setDozing(boolean dozing) {
         if (mDozing != dozing) {
             mDozing = dozing;
-            if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) {
+            reset(true /* hideBouncerWhenShowing */);
-                reset(dozing /* hideBouncerWhenShowing */);
-            }
             updateStates();
 
             if (!dozing) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -505,4 +506,21 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
         mBouncerExpansionCallback.onVisibilityChanged(false);
         verify(mCentralSurfaces).setBouncerShowingOverDream(false);
     }
+
+    @Test
+    public void testSetDozing_Dozing() {
+        clearInvocations(mBouncer);
+        mStatusBarKeyguardViewManager.onDozingChanged(true);
+        // Once when shown and once with dozing changed.
+        verify(mBouncer, times(1)).hide(false);
+    }
+
+    @Test
+    public void testSetDozing_notDozing() {
+        mStatusBarKeyguardViewManager.onDozingChanged(true);
+        clearInvocations(mBouncer);
+        mStatusBarKeyguardViewManager.onDozingChanged(false);
+        // Once when shown and twice with dozing changed.
+        verify(mBouncer, times(1)).hide(false);
+    }
 }