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

Commit 739d647f authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Do not require keyguard message's min time if being update to empty 

For example, don't require that the "Unlocked by face"
message shows the minimum show time if the biometric
message is being update to show nothing. This can happen
if the device starts dozing and the user quickly wakes
the device again. We don't want to reshow the unlocked
message when the user rewakes up the device within the
min show time since the unlocked info is no longer valid.

Test: atest KeyguardIndicationRotateTextViewControllerTest
Fixes: 228414801
Flag: None
Change-Id: Icc593319b4b717f83843d4eee3c8245436b835b6
parent 929ab9fd

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

+5 −8
Original line number Diff line number Diff line
@@ -187,19 +187,16 @@ public class KeyguardIndicationRotateTextViewController extends 
            return;

        }



        // current indication is updated to empty

        // Current indication is updated to empty.

        // Update to empty even if `currMsgShownForMinTime` is false.

        if (mCurrIndicationType == type

                && !hasNewIndication

                && showAsap) {

            if (currMsgShownForMinTime) {

            if (mShowNextIndicationRunnable != null) {

                mShowNextIndicationRunnable.runImmediately();

            } else {

                showIndication(INDICATION_TYPE_NONE);

            }

            } else {

                scheduleShowNextIndication(minShowDuration - timeSinceLastIndicationSwitch);

            }

        }

    }

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

+18 −0
Original line number Diff line number Diff line
@@ -345,6 +345,24 @@ public class KeyguardIndicationRotateTextViewControllerTest extends SysuiTestCas 
        verify(mView).switchIndication(null);

    }



    @Test

    public void testStartDozing_withMinShowTime() {

        // GIVEN a biometric message is showing

        mController.updateIndication(INDICATION_TYPE_BIOMETRIC_MESSAGE,

                new KeyguardIndication.Builder()

                        .setMessage("test_message")

                        .setMinVisibilityMillis(5000L)

                        .setTextColor(ColorStateList.valueOf(Color.WHITE))

                        .build(),

                true);



        // WHEN the device wants to hide the biometric message

        mController.hideIndication(INDICATION_TYPE_BIOMETRIC_MESSAGE);



        // THEN switch to INDICATION_TYPE_NONE

        verify(mView).switchIndication(null);

    }



    @Test

    public void testStoppedDozing() {

        // GIVEN we're dozing & we have an indication message