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

Commit aaf27b56 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Revert "Shutoff calls to KeyguardStatusViewController" 

Revert submission 26408412-mpietal_burnin

Reason for revert: Testing revert for b/327719899

Reverted changes: /q/submissionid:26408412-mpietal_burnin

Change-Id: I5d0faefa87f7626d1c084489eec0dcec75646771
parent 623bd0e4

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt

+19 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback 
import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.AuthController

import com.android.systemui.biometrics.data.repository.FakeFacePropertyRepository

import com.android.systemui.common.shared.model.Position

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.doze.DozeMachine

import com.android.systemui.doze.DozeTransitionCallback
@@ -150,6 +151,24 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { 
            assertThat(underTest.topClippingBounds.value).isEqualTo(500)

        }



    @Test

    fun clockPosition() =

        testScope.runTest {

            assertThat(underTest.clockPosition.value).isEqualTo(Position(0, 0))



            underTest.setClockPosition(0, 1)

            assertThat(underTest.clockPosition.value).isEqualTo(Position(0, 1))



            underTest.setClockPosition(1, 9)

            assertThat(underTest.clockPosition.value).isEqualTo(Position(1, 9))



            underTest.setClockPosition(1, 0)

            assertThat(underTest.clockPosition.value).isEqualTo(Position(1, 0))



            underTest.setClockPosition(3, 1)

            assertThat(underTest.clockPosition.value).isEqualTo(Position(3, 1))

        }



    @Test

    fun dozeTimeTick() =

        testScope.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)



        MockitoAnnotations.initMocks(this)

        whenever(burnInInteractor.burnIn(anyInt(), anyInt())).thenReturn(burnInFlow)

        whenever(burnInInteractor.keyguardBurnIn).thenReturn(burnInFlow)

        kosmos.burnInInteractor = burnInInteractor

        whenever(goneToAodTransitionViewModel.enterFromTopTranslationY(anyInt()))

            .thenReturn(emptyFlow())

packages/SystemUI/res/values/ids.xml

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ 
    <item type="id" name="lock_icon" />

    <item type="id" name="lock_icon_bg" />

    <item type="id" name="burn_in_layer" />

    <item type="id" name="burn_in_layer_empty_view" />

    <item type="id" name="communal_tutorial_indicator" />

    <item type="id" name="nssl_placeholder_barrier_bottom" />

    <item type="id" name="ambient_indication_container" />

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+17 −2
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.animation.ViewHierarchyAnimator;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.shared.model.TransitionState;

import com.android.systemui.keyguard.shared.model.TransitionStep;

import com.android.systemui.plugins.clocks.ClockController;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.power.shared.model.ScreenPowerState;
@@ -101,6 +104,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
    private final Rect mClipBounds = new Rect();

    private final KeyguardInteractor mKeyguardInteractor;

    private final PowerInteractor mPowerInteractor;

    private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    private final DozeParameters mDozeParameters;



    private View mStatusArea = null;
@@ -108,6 +112,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 


    private Boolean mSplitShadeEnabled = false;

    private Boolean mStatusViewCentered = true;

    private boolean mGoneToAodTransitionRunning = false;

    private DumpManager mDumpManager;



    private final TransitionListenerAdapter mKeyguardStatusAlignmentTransitionListener =
@@ -176,6 +181,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
            KeyguardLogger logger,

            InteractionJankMonitor interactionJankMonitor,

            KeyguardInteractor keyguardInteractor,

            KeyguardTransitionInteractor keyguardTransitionInteractor,

            DumpManager dumpManager,

            PowerInteractor powerInteractor) {

        super(keyguardStatusView);
@@ -191,6 +197,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        mDumpManager = dumpManager;

        mKeyguardInteractor = keyguardInteractor;

        mPowerInteractor = powerInteractor;

        mKeyguardTransitionInteractor = keyguardTransitionInteractor;

    }



    @Override
@@ -225,7 +232,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        mDumpManager.registerDumpable(getInstanceName(), this);

        if (migrateClocksToBlueprint()) {

            startCoroutines(EmptyCoroutineContext.INSTANCE);

            mView.setVisibility(View.GONE);

        }

    }
@@ -241,6 +247,15 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
                        dozeTimeTick();

                    }

                }, context);



        collectFlow(mView, mKeyguardTransitionInteractor.getGoneToAodTransition(),

                (TransitionStep step) -> {

                    if (step.getTransitionState() == TransitionState.RUNNING) {

                        mGoneToAodTransitionRunning = true;

                    } else {

                        mGoneToAodTransitionRunning = false;

                    }

                }, context);

    }



    public KeyguardStatusView getView() {
@@ -311,7 +326,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
     * Set keyguard status view alpha.

     */

    public void setAlpha(float alpha) {

        if (!mKeyguardVisibilityHelper.isVisibilityAnimating()) {

        if (!mKeyguardVisibilityHelper.isVisibilityAnimating() && !mGoneToAodTransitionRunning) {

            mView.setAlpha(alpha);

        }

    }

packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java

+0 −4
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ public class KeyguardVisibilityHelper { 
            boolean keyguardFadingAway,

            boolean goingToFullShade,

            int oldStatusBarState) {

        if (migrateClocksToBlueprint()) {

            log("Ignoring all of KeyguardVisibilityelper");

            return;

        }

        Assert.isMainThread();

        PropertyAnimator.cancelAnimation(mView, AnimatableProperty.ALPHA);

        boolean isOccluded = mKeyguardStateController.isOccluded();