Merge "Do not set alpha to 1f when bouncer shows" into udc-dev (42d23d2d) · Commits · e / os / android_frameworks_base

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);
		}

+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);
		}
		}

+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()
		}

+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());

+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