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

Commit 02fee826 authored by Yasin Kilicdere's avatar Yasin Kilicdere Committed by Android (Google) Code Review
Browse files

Merge "Reset title message in keyguard when onThemeChanged is called."

parents e0d7d1da 0d2ac3eb

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