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

Commit 7eec1943 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset the keyguardGoingAway flag when keyguard is not dismissed." into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918933



Change-Id: I72cc7fe61310bd8995124384c53e3ad93cdbfe2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c450ede c4c302a8

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,