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

Commit 84be506b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not run hint animation during aod=>ls transition" into tm-dev am: b1c35434 

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



Change-Id: I487c5dc730d56eaa933edce3b7d7c1bded5f4366
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7722d49c b1c35434

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -3210,7 +3210,7 @@ public class NotificationPanelViewController extends PanelViewController { 


    @Override

    protected void startUnlockHintAnimation() {

        if (mPowerManager.isPowerSaveMode()) {

        if (mPowerManager.isPowerSaveMode() || mAmbientState.getDozeAmount() > 0f) {

            onUnlockHintStarted();

            onUnlockHintFinished();

            return;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java

+25 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import com.android.keyguard.dagger.KeyguardQsUserSwitchComponent; 
import com.android.keyguard.dagger.KeyguardStatusBarViewComponent;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.keyguard.dagger.KeyguardUserSwitcherComponent;

import com.android.systemui.DejankUtils;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.biometrics.AuthController;
@@ -352,6 +353,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


        mKeyguardStatusView = new KeyguardStatusView(mContext);

        mKeyguardStatusView.setId(R.id.keyguard_status_view);

        DejankUtils.setImmediate(true);



        when(mAuthController.isUdfpsEnrolled(anyInt())).thenReturn(false);

        when(mHeadsUpCallback.getContext()).thenReturn(mContext);
@@ -941,6 +943,29 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        verify(mScrimController).setExpansionAffectsAlpha(true);

    }



    @Test

    public void testUnlockHintAnimation_runs_whenNotInPowerSaveMode_andDozeAmountIsZero() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(false);

        when(mAmbientState.getDozeAmount()).thenReturn(0f);

        mNotificationPanelViewController.startUnlockHintAnimation();

        assertThat(mNotificationPanelViewController.mHintAnimationRunning).isTrue();

    }



    @Test

    public void testUnlockHintAnimation_doesNotRun_inPowerSaveMode() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(true);

        mNotificationPanelViewController.startUnlockHintAnimation();

        assertThat(mNotificationPanelViewController.mHintAnimationRunning).isFalse();

    }



    @Test

    public void testUnlockHintAnimation_doesNotRun_whenDozeAmountNotZero() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(false);

        when(mAmbientState.getDozeAmount()).thenReturn(0.5f);

        mNotificationPanelViewController.startUnlockHintAnimation();

        assertThat(mNotificationPanelViewController.mHintAnimationRunning).isFalse();

    }



    @Test

    public void setKeyguardStatusBarAlpha_setsAlphaOnKeyguardStatusBarController() {

        float statusBarAlpha = 0.5f;