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

Commit cb47f799 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Setup KeyguardBouncerComponent."

parents 0f292589 4f0d8163

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+9 −29
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.car.keyguard; 


import android.car.Car;

import android.car.user.CarUserManager;

import android.content.Context;

import android.os.Bundle;

import android.os.Handler;

import android.util.Log;
@@ -28,20 +27,17 @@ import android.view.ViewRootImpl; 


import androidx.annotation.VisibleForTesting;



import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardViewController;

import com.android.keyguard.ViewMediatorCallback;

import com.android.keyguard.dagger.KeyguardBouncerComponent;

import com.android.systemui.R;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.car.CarServiceProvider;

import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.car.window.OverlayViewController;

import com.android.systemui.car.window.OverlayViewGlobalStateController;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.plugins.FalsingManager;

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

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

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -63,18 +59,14 @@ public class CarKeyguardViewController extends OverlayViewController implements 
    private static final String TAG = "CarKeyguardViewController";

    private static final boolean DEBUG = true;



    private final Context mContext;

    private final Handler mHandler;

    private final CarServiceProvider mCarServiceProvider;

    private final KeyguardStateController mKeyguardStateController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;

    private final LockPatternUtils mLockPatternUtils;

    private final FalsingManager mFalsingManager;

    private final Lazy<KeyguardBypassController> mKeyguardBypassControllerLazy;

    private final DismissCallbackRegistry mDismissCallbackRegistry;

    private final ViewMediatorCallback mViewMediatorCallback;

    private final CarNavigationBarController mCarNavigationBarController;

    private final KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory;

    // Needed to instantiate mBouncer.

    private final KeyguardBouncer.BouncerExpansionCallback

            mExpansionCallback = new KeyguardBouncer.BouncerExpansionCallback() {
@@ -107,7 +99,6 @@ public class CarKeyguardViewController extends OverlayViewController implements 


    @Inject

    public CarKeyguardViewController(

            Context context,

            @Main Handler mainHandler,

            CarServiceProvider carServiceProvider,

            OverlayViewGlobalStateController overlayViewGlobalStateController,
@@ -116,26 +107,18 @@ public class CarKeyguardViewController extends OverlayViewController implements 
            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            ViewMediatorCallback viewMediatorCallback,

            CarNavigationBarController carNavigationBarController,

            /* The params below are only used to reuse KeyguardBouncer */

            LockPatternUtils lockPatternUtils,

            DismissCallbackRegistry dismissCallbackRegistry,

            FalsingManager falsingManager,

            Lazy<KeyguardBypassController> keyguardBypassControllerLazy) {

            KeyguardBouncerComponent.Factory keyguardBouncerComponentFactory) {



        super(R.id.keyguard_stub, overlayViewGlobalStateController);



        mContext = context;

        mHandler = mainHandler;

        mCarServiceProvider = carServiceProvider;

        mKeyguardStateController = keyguardStateController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mBiometricUnlockControllerLazy = biometricUnlockControllerLazy;

        mLockPatternUtils = lockPatternUtils;

        mFalsingManager = falsingManager;

        mKeyguardBypassControllerLazy = keyguardBypassControllerLazy;

        mDismissCallbackRegistry = dismissCallbackRegistry;

        mViewMediatorCallback = viewMediatorCallback;

        mCarNavigationBarController = carNavigationBarController;

        mKeyguardBouncerComponentFactory = keyguardBouncerComponentFactory;



        registerUserSwitchedListener();

    }
@@ -147,11 +130,9 @@ public class CarKeyguardViewController extends OverlayViewController implements 


    @Override

    public void onFinishInflate() {

        mBouncer = SystemUIFactory.getInstance().createKeyguardBouncer(mContext,

                mViewMediatorCallback, mLockPatternUtils,

                getLayout().findViewById(R.id.keyguard_container), mDismissCallbackRegistry,

                mExpansionCallback, mKeyguardStateController, mFalsingManager,

                mKeyguardBypassControllerLazy.get());

        mBouncer = mKeyguardBouncerComponentFactory

                .build(getLayout().findViewById(R.id.keyguard_container), mExpansionCallback)

                .createKeyguardBouncer();

        mBiometricUnlockControllerLazy.get().setKeyguardViewController(this);

    }
@@ -359,9 +340,8 @@ public class CarKeyguardViewController extends OverlayViewController implements 
    public void registerStatusBar(StatusBar statusBar, ViewGroup container,

            NotificationPanelViewController notificationPanelViewController,

            BiometricUnlockController biometricUnlockController,

            DismissCallbackRegistry dismissCallbackRegistry, ViewGroup lockIconContainer,

            View notificationContainer, KeyguardBypassController bypassController,

            FalsingManager falsingManager) {

            ViewGroup lockIconContainer,

            View notificationContainer, KeyguardBypassController bypassController) {

        // no-op

    }

packages/CarSystemUI/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java

+15 −46
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.reset; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.Handler;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -35,20 +34,17 @@ import android.view.ViewGroup; 


import androidx.test.filters.SmallTest;



import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.keyguard.dagger.KeyguardBouncerComponent;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.car.CarServiceProvider;

import com.android.systemui.car.CarSystemUiTest;

import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.car.window.OverlayViewGlobalStateController;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.plugins.FalsingManager;

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

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

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

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



import org.junit.Before;
@@ -58,31 +54,36 @@ import org.mockito.InOrder; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import dagger.Lazy;



@CarSystemUiTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

@SmallTest

public class CarKeyguardViewControllerTest extends SysuiTestCase {



    private TestableCarKeyguardViewController mCarKeyguardViewController;

    private CarKeyguardViewController mCarKeyguardViewController;



    @Mock

    private OverlayViewGlobalStateController mOverlayViewGlobalStateController;

    @Mock

    private KeyguardBouncer mBouncer;

    private CarKeyguardViewController.OnKeyguardCancelClickedListener mCancelClickedListener;

    @Mock

    private CarNavigationBarController mCarNavigationBarController;

    private KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory;

    @Mock

    private CarKeyguardViewController.OnKeyguardCancelClickedListener mCancelClickedListener;

    private KeyguardBouncerComponent mKeyguardBouncerComponent;

    @Mock

    private KeyguardBouncer mBouncer;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mCarKeyguardViewController = new TestableCarKeyguardViewController(

                mContext,

        when(mKeyguardBouncerComponentFactory.build(

                any(ViewGroup.class),

                any(KeyguardBouncer.BouncerExpansionCallback.class)))

                .thenReturn(mKeyguardBouncerComponent);

        when(mKeyguardBouncerComponent.createKeyguardBouncer()).thenReturn(mBouncer);



        mCarKeyguardViewController = new CarKeyguardViewController(

                Handler.getMain(),

                mock(CarServiceProvider.class),

                mOverlayViewGlobalStateController,
@@ -91,10 +92,7 @@ public class CarKeyguardViewControllerTest extends SysuiTestCase { 
                () -> mock(BiometricUnlockController.class),

                mock(ViewMediatorCallback.class),

                mock(CarNavigationBarController.class),

                mock(LockPatternUtils.class),

                mock(DismissCallbackRegistry.class),

                mock(FalsingManager.class),

                () -> mock(KeyguardBypassController.class)

                mKeyguardBouncerComponentFactory

        );

        mCarKeyguardViewController.inflate((ViewGroup) LayoutInflater.from(mContext).inflate(

                R.layout.sysui_overlay_window, /* root= */ null));
@@ -202,33 +200,4 @@ public class CarKeyguardViewControllerTest extends SysuiTestCase { 


        verify(mBouncer).hide(/* destroyView= */ true);

    }



    private class TestableCarKeyguardViewController extends CarKeyguardViewController {



        TestableCarKeyguardViewController(Context context,

                Handler mainHandler,

                CarServiceProvider carServiceProvider,

                OverlayViewGlobalStateController overlayViewGlobalStateController,

                KeyguardStateController keyguardStateController,

                KeyguardUpdateMonitor keyguardUpdateMonitor,

                Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

                ViewMediatorCallback viewMediatorCallback,

                CarNavigationBarController carNavigationBarController,

                LockPatternUtils lockPatternUtils,

                DismissCallbackRegistry dismissCallbackRegistry,

                FalsingManager falsingManager,

                Lazy<KeyguardBypassController> keyguardBypassControllerLazy) {

            super(context, mainHandler, carServiceProvider, overlayViewGlobalStateController,

                    keyguardStateController, keyguardUpdateMonitor, biometricUnlockControllerLazy,

                    viewMediatorCallback, carNavigationBarController, lockPatternUtils,

                    dismissCallbackRegistry, falsingManager, keyguardBypassControllerLazy);

        }



        @Override

        public void onFinishInflate() {

            super.onFinishInflate();

            setKeyguardBouncer(CarKeyguardViewControllerTest.this.mBouncer);

        }

    }



}

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

+0 −10
Original line number Diff line number Diff line
@@ -796,16 +796,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
                securityMode != SecurityMode.None && newView.needsInput());

    }



    private KeyguardSecurityViewFlipper getFlipper() {

        for (int i = 0; i < getChildCount(); i++) {

            View child = getChildAt(i);

            if (child instanceof KeyguardSecurityViewFlipper) {

                return (KeyguardSecurityViewFlipper) child;

            }

        }

        return null;

    }



    private KeyguardSecurityCallback mCallback = new KeyguardSecurityCallback() {

        public void userActivity() {

            if (mSecurityCallback != null) {

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

+1 −7
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewRootImpl;



import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.FalsingManager;

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

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

import com.android.systemui.statusbar.phone.NotificationPanelViewController;
@@ -180,22 +178,18 @@ public interface KeyguardViewController { 


    /**

     * Registers the StatusBar to which this Keyguard View is mounted.

     *

     * @param statusBar

     * @param container

     * @param notificationPanelViewController

     * @param biometricUnlockController

     * @param dismissCallbackRegistry

     * @param lockIconContainer

     * @param notificationContainer

     * @param bypassController

     * @param falsingManager

     */

    void registerStatusBar(StatusBar statusBar,

            ViewGroup container,

            NotificationPanelViewController notificationPanelViewController,

            BiometricUnlockController biometricUnlockController,

            DismissCallbackRegistry dismissCallbackRegistry,

            ViewGroup lockIconContainer, View notificationContainer,

            KeyguardBypassController bypassController, FalsingManager falsingManager);

            KeyguardBypassController bypassController);

}

packages/SystemUI/src/com/android/keyguard/dagger/ContainerView.java

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.keyguard.dagger;



import static java.lang.annotation.RetentionPolicy.RUNTIME;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;



import javax.inject.Qualifier;



@Qualifier

@Documented

@Retention(RUNTIME)

public @interface ContainerView {

}