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

Commit c4c302a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reset the keyguardGoingAway flag when keyguard is not dismissed." into tm-qpr-dev

parents 7b82521b 595c164a

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

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.keyguard.LockIconView.ICON_LOCK; 
import static com.android.keyguard.LockIconView.ICON_UNLOCK;

import static com.android.systemui.classifier.Classifier.LOCK_ICON;

import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;

import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInProgressOffset;



import android.content.res.Configuration;

import android.content.res.Resources;
@@ -403,7 +402,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        float offsetY = MathUtils.lerp(0f,

                getBurnInOffset(mMaxBurnInOffsetY * 2, false /* xAxis */)

                        - mMaxBurnInOffsetY, mInterpolatedDarkAmount);

        float progress = MathUtils.lerp(0f, getBurnInProgressOffset(), mInterpolatedDarkAmount);



        mView.setTranslationX(offsetX);

        mView.setTranslationY(offsetY);

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -2707,7 +2707,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
    /** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */

    public void hideSurfaceBehindKeyguard() {

        mSurfaceBehindRemoteAnimationRequested = false;



        mKeyguardStateController.notifyKeyguardGoingAway(false);

        if (mShowing) {

            setShowingLocked(true, true);

        }

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+7 −0
Original line number Diff line number Diff line
@@ -203,6 +203,13 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
                mViewMediator.mViewMediatorCallback.getBouncerPromptReason());

    }



    @Test

    public void testHideSurfaceBehindKeyguardMarksKeyguardNotGoingAway() {

        mViewMediator.hideSurfaceBehindKeyguard();



        verify(mKeyguardStateController).notifyKeyguardGoingAway(false);

    }



    private void createAndStartViewMediator() {

        mViewMediator = new KeyguardViewMediator(

                mContext,