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

Commit b4b24438 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "modularizing_sysui" 

* changes:
  Introduce BubbleModule and KeyguardModule
  Introduce StatusBarModule
  Introduce StatusBarPhoneModule
  Expand NotificationsModule
parents b4caaafe 5cb6e52e

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

+5 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.systemui;



import com.android.systemui.biometrics.AuthController;

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

import com.android.systemui.globalactions.GlobalActionsComponent;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.dagger.KeyguardModule;

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

import com.android.systemui.pip.PipUI;

import com.android.systemui.power.PowerUI;
@@ -29,6 +31,7 @@ import com.android.systemui.stackdivider.Divider; 
import com.android.systemui.statusbar.car.CarStatusBar;

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

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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

import com.android.systemui.statusbar.tv.TvStatusBar;

import com.android.systemui.theme.ThemeOverlayController;
@@ -42,7 +45,8 @@ import dagger.multibindings.ClassKey; 
import dagger.multibindings.IntoMap;



/** Binder for car specific {@link SystemUI} modules. */

@Module(includes = {RecentsModule.class, CarStatusBarModule.class})

@Module(includes = {RecentsModule.class, CarStatusBarModule.class, NotificationsModule.class,

        BubbleModule.class, KeyguardModule.class})

public abstract class CarSystemUIBinder {

    /** Inject into AuthController. */

    @Binds

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

+5 −2
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ import com.android.systemui.statusbar.NotificationMediaManager; 
import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.StatusBarDependenciesModule;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.dagger.StatusBarDependenciesModule;

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

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

import com.android.systemui.statusbar.notification.NotificationAlertingManager;
@@ -67,6 +67,7 @@ import com.android.systemui.statusbar.notification.VisualStabilityManager; 
import com.android.systemui.statusbar.notification.init.NotificationsController;

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

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.row.NotificationRowModule;

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

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

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -87,6 +88,7 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; 
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

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

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneDependenciesModule;

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -112,7 +114,8 @@ import dagger.Provides; 
/**

 * Dagger Module providing {@link CarStatusBar}.

 */

@Module(includes = {StatusBarDependenciesModule.class})

@Module(includes = {StatusBarDependenciesModule.class, StatusBarPhoneDependenciesModule.class,

        NotificationRowModule.class})

public class CarStatusBarModule {

    /**

     * Provides our instance of StatusBar which is considered optional.

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

+4 −8
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ import com.android.internal.statusbar.NotificationVisibility; 
import com.android.systemui.DumpController;

import com.android.systemui.Dumpable;

import com.android.systemui.R;

import com.android.systemui.bubbles.BubbleController.BubbleExpandListener;

import com.android.systemui.bubbles.BubbleController.BubbleStateChangeListener;

import com.android.systemui.bubbles.BubbleController.NotifCallback;

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

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

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.PinnedStackListenerForwarder;
@@ -105,16 +103,12 @@ import java.util.ArrayList; 
import java.util.HashSet;

import java.util.List;



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * Bubbles are a special type of content that can "float" on top of other apps or System UI.

 * Bubbles can be expanded to show more content.

 *

 * The controller manages addition, removal, and visible state of bubbles on screen.

 */

@Singleton

public class BubbleController implements ConfigurationController.ConfigurationListener, Dumpable {



    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;
@@ -277,7 +271,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        }

    }



    @Inject

    public BubbleController(Context context,

            NotificationShadeWindowController notificationShadeWindowController,

            StatusBarStateController statusBarStateController,
@@ -298,6 +291,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
                notifPipeline, featureFlags, dumpController);

    }



    /**

     * Injected constructor. See {@link BubbleModule}.

     */

    public BubbleController(Context context,

            NotificationShadeWindowController notificationShadeWindowController,

            StatusBarStateController statusBarStateController,

packages/SystemUI/src/com/android/systemui/bubbles/dagger/BubbleModule.java

0 → 100644
+81 −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.bubbles.dagger;



import android.content.Context;



import com.android.systemui.DumpController;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.bubbles.BubbleData;

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

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

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

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

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

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.policy.ConfigurationController;

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



import javax.inject.Singleton;



import dagger.Module;

import dagger.Provides;



/** */

@Module

public interface BubbleModule {



    /**

     */

    @Singleton

    @Provides

    static BubbleController newBubbleController(

            Context context,

            NotificationShadeWindowController notificationShadeWindowController,

            StatusBarStateController statusBarStateController,

            ShadeController shadeController,

            BubbleData data,

            ConfigurationController configurationController,

            NotificationInterruptionStateProvider interruptionStateProvider,

            ZenModeController zenModeController,

            NotificationLockscreenUserManager notifUserManager,

            NotificationGroupManager groupManager,

            NotificationEntryManager entryManager,

            NotifPipeline notifPipeline,

            FeatureFlags featureFlags,

            DumpController dumpController) {

        return new BubbleController(

                context,

                notificationShadeWindowController,

                statusBarStateController,

                shadeController,

                data,

                /* synchronizer */null,

                configurationController,

                interruptionStateProvider,

                zenModeController,

                notifUserManager,

                groupManager,

                entryManager,

                notifPipeline,

                featureFlags,

                dumpController);

    }

}

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+0 −13
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.os.HandlerThread; 
import android.os.ServiceManager;

import android.util.DisplayMetrics;

import android.view.Choreographer;

import android.view.IWindowManager;

import android.view.LayoutInflater;

import android.view.WindowManager;
@@ -46,8 +45,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; 
import com.android.systemui.shared.system.DevicePolicyManagerWrapper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

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

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

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

import com.android.systemui.statusbar.policy.DataSaverController;
@@ -160,16 +157,6 @@ public class DependencyProvider { 
        return new ConfigurationControllerImpl(context);

    }



    @Singleton

    @Provides

    public AutoHideController provideAutoHideController(Context context,

            @Main Handler mainHandler,

            NotificationRemoteInputManager notificationRemoteInputManager,

            IWindowManager iWindowManager) {

        return new AutoHideController(context, mainHandler, notificationRemoteInputManager,

                iWindowManager);

    }



    @Singleton

    @Provides

    public ActivityManagerWrapper provideActivityManagerWrapper() {