Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f4d21f9 authored by Aaron Liu's avatar Aaron Liu
Browse files

Revert "[Bouncer] reset bouncer visibility with doze state." 

This reverts commit 59005120.

Reason for revert: Causing other issues an cts failures

Change-Id: I53b5a824ef751dd6764cd5780f253e3c599f9d51
parent 59005120

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

+3 −1
Original line number Diff line number Diff line
@@ -667,7 +667,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private void setDozing(boolean dozing) {

        if (mDozing != dozing) {

            mDozing = dozing;

            reset(true /* hideBouncerWhenShowing */);

            if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) {

                reset(dozing /* hideBouncerWhenShowing */);

            }

            updateStates();



            if (!dozing) {

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

+0 −18
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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;
@@ -506,21 +505,4 @@ 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);

    }

}