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

Commit 6b613fb4 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Always use the MessageAreaController for SIM pin and puk" into main

parents 9df938df 4513fa7f

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,10 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
        }

        }

    }

    }





    private void updateMessageAreaVisibility() {

    /**

     * Determines whether to show the message area controlled by MessageAreaController.

     */

    public void updateMessageAreaVisibility() {

        if (mMessageAreaController == null) return;

        if (mMessageAreaController == null) return;

        if (Flags.revampedBouncerMessages()) {

        if (Flags.revampedBouncerMessages()) {

            mMessageAreaController.disable();

            mMessageAreaController.disable();

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,12 @@ public class KeyguardSimPinViewController 
        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

    }

    }





    @Override

    public void updateMessageAreaVisibility() {

        if (mMessageAreaController == null) return;

        mMessageAreaController.setIsVisible(true);

    }



    @Override

    @Override

    void resetState() {

    void resetState() {

        super.resetState();

        super.resetState();

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -114,6 +114,12 @@ public class KeyguardSimPukViewController 
        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

    }

    }





    @Override

    public void updateMessageAreaVisibility() {

        if (mMessageAreaController == null) return;

        mMessageAreaController.setIsVisible(true);

    }



    @Override

    @Override

    public void onResume(int reason) {

    public void onResume(int reason) {

        super.onResume(reason);

        super.onResume(reason);

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() { 
    @Test

    @Test

    fun onViewAttached() {

    fun onViewAttached() {

        underTest.onViewAttached()

        underTest.onViewAttached()

        verify(keyguardMessageAreaController).setIsVisible(true)

        verify(keyguardMessageAreaController)

        verify(keyguardMessageAreaController)

            .setMessage(context.resources.getString(R.string.keyguard_enter_your_pin), false)

            .setMessage(context.resources.getString(R.string.keyguard_enter_your_pin), false)

        verify(keyguardUpdateMonitor)

        verify(keyguardUpdateMonitor)

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -103,7 +103,9 @@ class KeyguardSimPukViewControllerTest : SysuiTestCase() { 




    @Test

    @Test

    fun onViewAttached() {

    fun onViewAttached() {

        Mockito.reset(keyguardMessageAreaController)

        underTest.onViewAttached()

        underTest.onViewAttached()

        Mockito.verify(keyguardMessageAreaController).setIsVisible(true)

        Mockito.verify(keyguardUpdateMonitor)

        Mockito.verify(keyguardUpdateMonitor)

            .registerCallback(any(KeyguardUpdateMonitorCallback::class.java))

            .registerCallback(any(KeyguardUpdateMonitorCallback::class.java))

        Mockito.verify(keyguardMessageAreaController)

        Mockito.verify(keyguardMessageAreaController)