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

Commit eac5ddd4 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Add initial text for bouncer." into tm-qpr-dev am: f4d9dcba am: 6cd9cb75 

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



Change-Id: Ic896a6cfe464e8b1bed6f7d73ded53905f519b0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f841aeb 6cd9cb75

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

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.keyguard; 


import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.text.TextUtils;



import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
@@ -103,6 +104,15 @@ public class KeyguardMessageAreaController extends ViewController<KeyguardMessag 
        mView.setMessage(resId);

    }



    /**

     * Set Text if KeyguardMessageArea is empty.

     */

    public void setMessageIfEmpty(int resId) {

        if (TextUtils.isEmpty(mView.getText())) {

            setMessage(resId);

        }

    }



    public void setNextMessageColor(ColorStateList colorState) {

        mView.setNextMessageColor(colorState);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class KeyguardPasswordViewController 
        if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {

            showInput();

        }

        mMessageAreaController.setMessageIfEmpty(R.string.keyguard_enter_your_password);

    }



    private void showInput() {

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

+6 −0
Original line number Diff line number Diff line
@@ -303,6 +303,12 @@ public class KeyguardPatternViewController 
        displayDefaultSecurityMessage();

    }



    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        mMessageAreaController.setMessageIfEmpty(R.string.keyguard_enter_your_pattern);

    }



    @Override

    public boolean needsInput() {

        return false;

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

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 
    public void onResume(int reason) {

        super.onResume(reason);

        mPasswordEntry.requestFocus();

        mMessageAreaController.setMessageIfEmpty(R.string.keyguard_enter_your_pin);

    }



    @Override

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

+17 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.keyguard;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;



import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
@@ -90,4 +92,19 @@ public class KeyguardMessageAreaControllerTest extends SysuiTestCase { 
        mMessageAreaController.setBouncerShowing(true);

        verify(mKeyguardMessageArea).setBouncerShowing(true);

    }



    @Test

    public void testSetMessageIfEmpty_empty() {

        mMessageAreaController.setMessage("");

        mMessageAreaController.setMessageIfEmpty(R.string.keyguard_enter_your_pin);

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

    }



    @Test

    public void testSetMessageIfEmpty_notEmpty() {

        mMessageAreaController.setMessage("abc");

        mMessageAreaController.setMessageIfEmpty(R.string.keyguard_enter_your_pin);

        verify(mKeyguardMessageArea, never()).setMessage(getContext()

                .getResources().getText(R.string.keyguard_enter_your_pin));

    }

}