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

Commit 606745f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide lock icon after bouncer is gone"

parents a53bfe2c bea18f73
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
        if (bouncerShowing != mLastBouncerShowing || mFirstUpdate) {
            mStatusBarWindowController.setBouncerShowing(bouncerShowing);
            mStatusBar.setBouncerShowing(bouncerShowing);
            updateLockIcon();
        }

        KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyFloat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -30,6 +31,7 @@ import android.content.Context;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import android.view.ViewGroup;
import android.view.ViewPropertyAnimator;

import androidx.test.filters.SmallTest;

@@ -79,6 +81,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
        mDependency.injectMockDependency(StatusBarWindowController.class);
        mDependency.injectTestDependency(StatusBarStateController.class, mStatusBarStateController);
        when(mLockIconContainer.getParent()).thenReturn(mock(ViewGroup.class));
        when(mLockIconContainer.animate()).thenReturn(mock(ViewPropertyAnimator.class,
                RETURNS_DEEP_STUBS));
        mStatusBarKeyguardViewManager = new TestableStatusBarKeyguardViewManager(getContext(),
                mViewMediatorCallback, mLockPatternUtils);
        mStatusBarKeyguardViewManager.registerStatusBar(mStatusBar, mContainer,