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

Commit 5342344f authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Do not set alpha to 1f when bouncer shows" into udc-dev am: 42d23d2d... 

Merge "Do not set alpha to 1f when bouncer shows" into udc-dev am: 42d23d2d am: 3bfb228e am: 1d70e8d7

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



Change-Id: I0a5f30666a2577a6dcb6dae60a10b817b4c912ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06a91a59 1d70e8d7

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

+0 −1
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
     */

    public void startAppearAnimation(SecurityMode securityMode) {

        setTranslationY(0f);

        setAlpha(1f);

        updateChildren(0 /* translationY */, 1f /* alpha */);

        mViewMode.startAppearAnimation(securityMode);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 


    public void startAppearAnimation() {

        if (mCurrentSecurityMode != SecurityMode.None) {

            setAlpha(1f);

            mView.startAppearAnimation(mCurrentSecurityMode);

            getCurrentSecurityController(controller -> controller.startAppearAnimation());

        }
@@ -1112,7 +1111,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
     */

    public void setExpansion(float fraction) {

        float scaledFraction = BouncerPanelExpansionCalculator.showBouncerProgress(fraction);

        mView.setAlpha(MathUtils.constrain(1 - scaledFraction, 0f, 1f));

        setAlpha(MathUtils.constrain(1 - scaledFraction, 0f, 1f));

        mView.setTranslationY(scaledFraction * mTranslationY);

    }

}

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.keyguard.data.BouncerView 
import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository

import com.android.systemui.keyguard.data.repository.TrustRepository

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN

import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.shared.system.SysUiStatsLog
@@ -196,6 +197,7 @@ constructor( 
        cancelShowRunnable()

        repository.setPrimaryShowingSoon(false)

        repository.setPrimaryShow(false)

        repository.setPanelExpansion(EXPANSION_HIDDEN)

        primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.INVISIBLE)

        Trace.endSection()

    }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.keyguard; 


import static com.android.keyguard.KeyguardSecurityContainer.MODE_DEFAULT;

import static com.android.keyguard.KeyguardSecurityContainer.MODE_ONE_HANDED;

import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE;



import static com.google.common.truth.Truth.assertThat;
@@ -691,6 +692,14 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
        verify(mSideFpsController).hide(SideFpsUiRequestSource.PRIMARY_BOUNCER);

    }



    @Test

    public void setExpansion_setsAlpha() {

        mKeyguardSecurityContainerController.setExpansion(EXPANSION_VISIBLE);



        verify(mView).setAlpha(1f);

        verify(mView).setTranslationY(0f);

    }



    private KeyguardSecurityContainer.SwipeListener getRegisteredSwipeListener() {

        mKeyguardSecurityContainerController.onViewAttached();

        verify(mView).setSwipeListener(mSwipeListenerArgumentCaptor.capture());

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { 
        verify(repository).setPrimaryShow(false)

        verify(mPrimaryBouncerCallbackInteractor).dispatchVisibilityChanged(View.INVISIBLE)

        verify(repository).setPrimaryStartDisappearAnimation(null)

        verify(repository).setPanelExpansion(EXPANSION_HIDDEN)

    }



    @Test