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

Commit 8f1c1395 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Ensure AoD transient messagesa are updated" into tm-qpr-dev am: 4c71a784 am: a3d07142 

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



Change-Id: Ia7edb7cb0581585dce2d8740b93acd1469b92045
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a62fb919 a3d07142

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+33 −19
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import static com.android.systemui.keyguard.ScreenLifecycle.SCREEN_ON; 
import static com.android.systemui.plugins.FalsingManager.LOW_PENALTY;

import static com.android.systemui.plugins.log.LogLevel.ERROR;



import android.app.AlarmManager;

import android.app.admin.DevicePolicyManager;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -99,6 +100,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

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

import com.android.systemui.util.AlarmTimeout;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.wakelock.SettableWakeLock;

import com.android.systemui.util.wakelock.WakeLock;
@@ -128,10 +130,8 @@ public class KeyguardIndicationController { 
    private static final String TAG = "KeyguardIndication";

    private static final boolean DEBUG_CHARGING_SPEED = false;



    private static final int MSG_HIDE_TRANSIENT = 1;

    private static final int MSG_SHOW_ACTION_TO_UNLOCK = 2;

    private static final int MSG_HIDE_BIOMETRIC_MESSAGE = 3;

    private static final int MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON = 4;

    private static final int MSG_SHOW_ACTION_TO_UNLOCK = 1;

    private static final int MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON = 2;

    private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300;

    public static final long DEFAULT_HIDE_DELAY_MS =

            3500 + KeyguardIndicationTextView.Y_IN_DURATION;
@@ -213,6 +213,11 @@ public class KeyguardIndicationController { 
    };

    private boolean mFaceLockedOutThisAuthSession;



    // Use AlarmTimeouts to guarantee that the events are handled even if scheduled and

    // triggered while the device is asleep

    private final AlarmTimeout mHideTransientMessageHandler;

    private final AlarmTimeout mHideBiometricMessageHandler;



    /**

     * Creates a new KeyguardIndicationController and registers callbacks.

     */
@@ -239,7 +244,9 @@ public class KeyguardIndicationController { 
            AccessibilityManager accessibilityManager,

            FaceHelpMessageDeferral faceHelpMessageDeferral,

            KeyguardLogger keyguardLogger,

            AlternateBouncerInteractor alternateBouncerInteractor) {

            AlternateBouncerInteractor alternateBouncerInteractor,

            AlarmManager alarmManager

    ) {

        mContext = context;

        mBroadcastDispatcher = broadcastDispatcher;

        mDevicePolicyManager = devicePolicyManager;
@@ -274,17 +281,26 @@ public class KeyguardIndicationController { 
        mHandler = new Handler(mainLooper) {

            @Override

            public void handleMessage(Message msg) {

                if (msg.what == MSG_HIDE_TRANSIENT) {

                    hideTransientIndication();

                } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) {

                if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) {

                    showActionToUnlock();

                } else if (msg.what == MSG_HIDE_BIOMETRIC_MESSAGE) {

                    hideBiometricMessage();

                } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) {

                    mBiometricErrorMessageToShowOnScreenOn = null;

                }

            }

        };



        mHideTransientMessageHandler = new AlarmTimeout(

                alarmManager,

                this::hideTransientIndication,

                TAG,

                mHandler

        );

        mHideBiometricMessageHandler = new AlarmTimeout(

                alarmManager,

                this::hideBiometricMessage,

                TAG,

                mHandler

        );

    }



    /** Call this after construction to finish setting up the instance. */
@@ -336,6 +352,8 @@ public class KeyguardIndicationController { 
     */

    public void destroy() {

        mHandler.removeCallbacksAndMessages(null);

        mHideBiometricMessageHandler.cancel();

        mHideTransientMessageHandler.cancel();

        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

    }
@@ -691,7 +709,7 @@ public class KeyguardIndicationController { 
        if (visible) {

            // If this is called after an error message was already shown, we should not clear it.

            // Otherwise the error message won't be shown

            if (!mHandler.hasMessages(MSG_HIDE_TRANSIENT)) {

            if (!mHideTransientMessageHandler.isScheduled()) {

                hideTransientIndication();

            }

            updateDeviceEntryIndication(false);
@@ -739,16 +757,14 @@ public class KeyguardIndicationController { 
     * Hides transient indication in {@param delayMs}.

     */

    public void hideTransientIndicationDelayed(long delayMs) {

        mHandler.sendMessageDelayed(

                mHandler.obtainMessage(MSG_HIDE_TRANSIENT), delayMs);

        mHideTransientMessageHandler.schedule(delayMs, AlarmTimeout.MODE_RESCHEDULE_IF_SCHEDULED);

    }



    /**

     * Hides biometric indication in {@param delayMs}.

     */

    public void hideBiometricMessageDelayed(long delayMs) {

        mHandler.sendMessageDelayed(

                mHandler.obtainMessage(MSG_HIDE_BIOMETRIC_MESSAGE), delayMs);

        mHideBiometricMessageHandler.schedule(delayMs, AlarmTimeout.MODE_RESCHEDULE_IF_SCHEDULED);

    }



    /**
@@ -763,7 +779,6 @@ public class KeyguardIndicationController { 
     */

    private void showTransientIndication(CharSequence transientIndication) {

        mTransientIndication = transientIndication;

        mHandler.removeMessages(MSG_HIDE_TRANSIENT);

        hideTransientIndicationDelayed(DEFAULT_HIDE_DELAY_MS);



        updateTransient();
@@ -789,7 +804,6 @@ public class KeyguardIndicationController { 
        mBiometricMessageFollowUp = biometricMessageFollowUp;



        mHandler.removeMessages(MSG_SHOW_ACTION_TO_UNLOCK);

        mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE);

        hideBiometricMessageDelayed(

                mBiometricMessageFollowUp != null

                        ? IMPORTANT_MSG_MIN_DURATION * 2
@@ -803,7 +817,7 @@ public class KeyguardIndicationController { 
        if (mBiometricMessage != null || mBiometricMessageFollowUp != null) {

            mBiometricMessage = null;

            mBiometricMessageFollowUp = null;

            mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE);

            mHideBiometricMessageHandler.cancel();

            updateBiometricMessage();

        }

    }
@@ -814,7 +828,7 @@ public class KeyguardIndicationController { 
    public void hideTransientIndication() {

        if (mTransientIndication != null) {

            mTransientIndication = null;

            mHandler.removeMessages(MSG_HIDE_TRANSIENT);

            mHideTransientMessageHandler.cancel();

            updateTransient();

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;



import android.app.AlarmManager;

import android.app.Instrumentation;

import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyResourcesManager;
@@ -184,6 +185,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
    private ScreenLifecycle mScreenLifecycle;

    @Mock

    private AuthController mAuthController;

    @Mock

    private AlarmManager mAlarmManager;

    @Captor

    private ArgumentCaptor<DockManager.AlignmentStateListener> mAlignmentListener;

    @Captor
@@ -286,7 +289,9 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
                mAuthController, mLockPatternUtils, mScreenLifecycle,

                mKeyguardBypassController, mAccessibilityManager,

                mFaceHelpMessageDeferral, mock(KeyguardLogger.class),

                mAlternateBouncerInteractor);

                mAlternateBouncerInteractor,

                mAlarmManager

        );

        mController.init();

        mController.setIndicationArea(mIndicationArea);

        verify(mStatusBarStateController).addCallback(mStatusBarStateListenerCaptor.capture());