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

Commit 6e792cce authored by Heemin Seog's avatar Heemin Seog
Browse files

Separate UI and StatusBar from BiometricUnlockController 

Bug: 162744974
Bug: 155711562
Test: manual, atest SystemUITests, atest :carsysui-presubmit
Change-Id: I1a8b6a31e6d965f849d678af0e4c46f236641aac
parent 6c1cf6cc

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+6 −6
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.CarDeviceProvisionedControllerImpl;

import com.android.systemui.car.keyguard.CarKeyguardViewController;

import com.android.systemui.car.notification.NotificationShadeWindowControllerImpl;

import com.android.systemui.car.statusbar.DozeServiceHost;

import com.android.systemui.car.statusbar.DummyNotificationShadeWindowController;

import com.android.systemui.car.volume.CarVolumeDialogComponent;

import com.android.systemui.dagger.GlobalRootComponent;

import com.android.systemui.dagger.qualifiers.Background;
@@ -53,12 +53,12 @@ import com.android.systemui.stackdivider.DividerModule; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;
@@ -208,6 +208,10 @@ abstract class CarSystemUIModule { 
    abstract KeyguardViewController bindKeyguardViewController(

            CarKeyguardViewController carKeyguardViewController);



    @Binds

    abstract NotificationShadeWindowController bindNotificationShadeController(

            NotificationShadeWindowControllerImpl notificationPanelViewController);



    @Binds

    abstract DeviceProvisionedController bindDeviceProvisionedController(

            CarDeviceProvisionedControllerImpl deviceProvisionedController);
@@ -216,10 +220,6 @@ abstract class CarSystemUIModule { 
    abstract CarDeviceProvisionedController bindCarDeviceProvisionedController(

            CarDeviceProvisionedControllerImpl deviceProvisionedController);



    @Binds

    abstract NotificationShadeWindowController bindNotificationShadeWindowController(

            DummyNotificationShadeWindowController notificationShadeWindowController);



    @Binds

    abstract DozeHost bindDozeHost(DozeServiceHost dozeServiceHost);

}

packages/CarSystemUI/src/com/android/systemui/car/notification/NotificationShadeWindowControllerImpl.java

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

 * Copyright (C) 2020 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.systemui.car.notification;



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

import com.android.systemui.statusbar.NotificationShadeWindowController;



import javax.inject.Inject;

import javax.inject.Singleton;



/** The automotive version of the notification shade window controller. */

@Singleton

public class NotificationShadeWindowControllerImpl implements

        NotificationShadeWindowController {



    private final OverlayViewGlobalStateController mController;



    @Inject

    public NotificationShadeWindowControllerImpl(OverlayViewGlobalStateController controller) {

        mController = controller;

    }



    @Override

    public void setForceDozeBrightness(boolean forceDozeBrightness) {

        // No-op since dozing is not supported in Automotive devices.

    }



    @Override

    public void setNotificationShadeFocusable(boolean focusable) {

        mController.setWindowFocusable(focusable);

    }

}

packages/CarSystemUI/src/com/android/systemui/car/statusbar/DummyNotificationShadeWindowController.java

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.systemui.car.statusbar;



import android.app.IActivityManager;

import android.content.Context;

import android.view.WindowManager;



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

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

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

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

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

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



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * A dummy implementation of {@link NotificationShadeWindowController}.

 *

 * TODO(b/155711562): This should be replaced with a longer term solution (i.e. separating

 * {@link BiometricUnlockController} from the views it depends on).

 */

@Singleton

public class DummyNotificationShadeWindowController extends NotificationShadeWindowController {

    private final SystemUIOverlayWindowController mOverlayWindowController;



    @Inject

    public DummyNotificationShadeWindowController(Context context,

            WindowManager windowManager, IActivityManager activityManager,

            DozeParameters dozeParameters,

            StatusBarStateController statusBarStateController,

            ConfigurationController configurationController,

            KeyguardViewMediator keyguardViewMediator,

            KeyguardBypassController keyguardBypassController,

            SysuiColorExtractor colorExtractor,

            DumpManager dumpManager,

            SystemUIOverlayWindowController overlayWindowController) {

        super(context, windowManager, activityManager, dozeParameters, statusBarStateController,

                configurationController, keyguardViewMediator, keyguardBypassController,

                colorExtractor, dumpManager);

        mOverlayWindowController = overlayWindowController;

    }



    @Override

    public void setForceDozeBrightness(boolean forceDozeBrightness) {

        // No op.

    }



    @Override

    public void setNotificationShadeFocusable(boolean focusable) {

        // The overlay window is the car sysui equivalent of the notification shade.

        mOverlayWindowController.setWindowFocusable(focusable);

    }

}

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −3
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ import com.android.systemui.fragments.FragmentService; 
import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.PluginDependencyProvider;
@@ -64,11 +66,11 @@ import com.android.systemui.shared.system.DevicePolicyManagerWrapper; 
import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.VibratorHelper;
@@ -85,10 +87,8 @@ import com.android.systemui.statusbar.phone.KeyguardDismissUtil; 
import com.android.systemui.statusbar.phone.LightBarController;

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

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

import com.android.systemui.navigationbar.NavigationModeController;

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+1 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.systemui.Dumpable;

import com.android.systemui.bubbles.animation.StackAnimationController;

import com.android.systemui.bubbles.dagger.BubbleModule;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.model.SysUiState;
@@ -96,6 +95,7 @@ import com.android.systemui.shared.system.WindowManagerWrapper; 
import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationRemoveInterceptor;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.notification.NotificationChannelHelper;

import com.android.systemui.statusbar.notification.NotificationEntryListener;
@@ -109,7 +109,6 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.No 
import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

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

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

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

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

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