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

Commit 0d2ac3eb authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

Reset title message in keyguard when onThemeChanged is called. 

If keyguard is visible when wallpaper colors changed event is
propogated, title message of the keyguard was disappearing. This was
a flaky janky behaviour since those events were not synced, but it
will be consistently visible after fixing b/266711330.

Bug: 266940281
Bug: 266711330
Test: Tested manually by delaying user switch events (via ag/21145270)
to make the jank consistent, and made sure it's gone after the fix is
applied.
Test: atest KeyguardSecurityContainerControllerTest
Test: atest KeyguardPinBasedInputViewControllerTest
Test: atest KeyguardPasswordViewControllerTest
Test: atest FrameworksServicesTests:UserControllerTest

Change-Id: Ifce985363eee20ab195eb6b2fdfc6dcf175ad9f1
parent bef72a40

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 


    @Override

    void resetState() {

        mMessageAreaController.setMessage(getInitialMessageResId());

        mView.setPasswordEntryEnabled(true);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                @Override

                public void onThemeChanged() {

                    reloadColors();

                    reset();

                }



                @Override

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -134,4 +134,10 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() { 
    keyguardPasswordViewController.startAppearAnimation()

    verify(mKeyguardMessageAreaController, never()).setMessage(anyString(), anyBoolean())

  }



  @Test

  fun testMessageIsSetWhenReset() {

    keyguardPasswordViewController.resetState()

    verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_password)

  }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -120,4 +120,10 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase { 
    public void testGetInitialMessageResId() {

        assertThat(mKeyguardPinViewController.getInitialMessageResId()).isNotEqualTo(0);

    }



    @Test

    public void testMessageIsSetWhenReset() {

        mKeyguardPinViewController.resetState();

        verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_pin);

    }

}

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

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
        verify(mKeyguardSecurityViewFlipperController).clearViews();

        verify(mKeyguardSecurityViewFlipperController).getSecurityView(any(SecurityMode.class),

                any(KeyguardSecurityCallback.class));

        verify(mView).reset();

        verify(mKeyguardSecurityViewFlipperController).reset();

    }



    @Test