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

Commit 3e7ce55b authored by Govinda Wasserman's avatar Govinda Wasserman
Browse files

Refactor SysUI to allow daggerization of implementations 

Test: Tested locally
Change-Id: I7ccbc2aff1d911e255183c5468f10d4dd016dd86
parent 77e02da8

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

0 → 100644
+77 −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.systemui;



import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME;



import android.content.Context;



import androidx.annotation.Nullable;



import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

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

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

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

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



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Binds;

import dagger.Module;

import dagger.Provides;



/**

 * A dagger module for injecting default implementations of components of System UI that may be

 * overridden by the System UI implementation.

 */

@Module

abstract class SystemUIDefaultModule {



    @Singleton

    @Provides

    @Named(LEAK_REPORT_EMAIL_NAME)

    @Nullable

    static String provideLeakReportEmail() {

        return null;

    }



    @Binds

    abstract EnhancedEstimates bindEnhancedEstimates(EnhancedEstimatesImpl enhancedEstimates);



    @Binds

    abstract NotificationLockscreenUserManager bindNotificationLockscreenUserManager(

            NotificationLockscreenUserManagerImpl notificationLockscreenUserManager);



    @Binds

    abstract DockManager bindDockManager(DockManagerImpl dockManager);



    @Binds

    abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment(

            KeyguardEnvironmentImpl keyguardEnvironment);



    @Singleton

    @Provides

    static ShadeController provideShadeController(Context context) {

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }

}

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

+11 −117
Original line number Diff line number Diff line
@@ -16,13 +16,8 @@ 


package com.android.systemui;



import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME;



import android.annotation.Nullable;

import android.app.AlarmManager;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Handler;

import android.os.Looper;

import android.util.Log;
@@ -33,59 +28,40 @@ import com.android.internal.util.function.TriConsumer; 
import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.dock.DockManager;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.ScrimView;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.util.AsyncSensorManager;

import com.android.systemui.volume.VolumeDialogComponent;



import java.util.function.Consumer;



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Module;

import dagger.Provides;



/**

 * Class factory to provide customizable SystemUI components.

 */

@Module

public class SystemUIFactory {

    private static final String TAG = "SystemUIFactory";



    static SystemUIFactory mFactory;

    private SystemUIRootComponent mRootComponent;

    protected SystemUIRootComponent mRootComponent;



    public static <T extends SystemUIFactory> T getInstance() {

        return (T) mFactory;
@@ -110,18 +86,21 @@ public class SystemUIFactory { 


    public SystemUIFactory() {}



    protected void init(Context context) {

        mRootComponent = DaggerSystemUIRootComponent.builder()

                .systemUIFactory(this)

                .dependencyProvider(new com.android.systemui.DependencyProvider())

                .contextHolder(new ContextHolder(context))

                .build();

    private void init(Context context) {

        mRootComponent = buildSystemUIRootComponent(context);



        // Every other part of our codebase currently relies on Dependency, so we

        // really need to ensure the Dependency gets initialized early on.

        Dependency.initDependencies(mRootComponent);

    }



    protected SystemUIRootComponent buildSystemUIRootComponent(Context context) {

        return DaggerSystemUIRootComponent.builder()

                .dependencyProvider(new com.android.systemui.DependencyProvider())

                .contextHolder(new ContextHolder(context))

                .build();

    }



    public SystemUIRootComponent getRootComponent() {

        return mRootComponent;

    }
@@ -170,93 +149,8 @@ public class SystemUIFactory { 
        return new VolumeDialogComponent(systemUi, context);

    }



    @Singleton

    @Provides

    public NotificationData.KeyguardEnvironment provideKeyguardEnvironment(Context context) {

        return new KeyguardEnvironmentImpl();

    }



    @Singleton

    @Provides

    public NotificationLockscreenUserManager provideNotificationLockscreenUserManager(

            Context context) {

        return new NotificationLockscreenUserManagerImpl(context);

    }



    @Singleton

    @Provides

    public AssistManager provideAssistManager(DeviceProvisionedController controller,

            Context context) {

        return new AssistManager(controller, context);

    }



    @Singleton

    @Provides

    @Nullable

    public DockManager provideDockManager(Context context) {

        return null;

    }



    @Singleton

    @Provides

    public NotificationEntryManager provideNotificationEntryManager(Context context) {

        return new NotificationEntryManager(context);

    }



    @Singleton

    @Provides

    public EnhancedEstimates provideEnhancedEstimates(Context context) {

        return new EnhancedEstimatesImpl();

    }



    @Singleton

    @Provides

    @Named(LEAK_REPORT_EMAIL_NAME)

    @Nullable

    public String provideLeakReportEmail() {

        return null;

    }



    @Singleton

    @Provides

    @Nullable

    public KeyguardLiftController provideKeyguardLiftController(Context context,

            StatusBarStateController statusBarStateController,

            AsyncSensorManager asyncSensorManager) {

        if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {

            return null;

        }

        return new KeyguardLiftController(context, statusBarStateController, asyncSensorManager);

    }



    @Singleton

    @Provides

    public NotificationListener provideNotificationListener(Context context) {

        return new NotificationListener(context);

    }



    @Singleton

    @Provides

    public NotificationInterruptionStateProvider provideNotificationInterruptionStateProvider(

            Context context) {

        return new NotificationInterruptionStateProvider(context);

    }



    @Singleton

    @Provides

    @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)

    public boolean provideAllowNotificationLongPress() {

        return true;

    }



    @Singleton

    @Provides

    public ShadeController provideShadeController(Context context) {

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }



    @Module

    protected static class ContextHolder {

    public static class ContextHolder {

        private Context mContext;



        public ContextHolder(Context context) {

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

0 → 100644
+60 −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.systemui;



import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;



import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.PackageManager;



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

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

import com.android.systemui.util.AsyncSensorManager;



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Module;

import dagger.Provides;



/**

 * A dagger module for injecting components of System UI that are not overridden by the System UI

 * implementation.

 */

@Module

public abstract class SystemUIModule {



    @Singleton

    @Provides

    @Nullable

    static KeyguardLiftController provideKeyguardLiftController(Context context,

            StatusBarStateController statusBarStateController,

            AsyncSensorManager asyncSensorManager) {

        if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {

            return null;

        }

        return new KeyguardLiftController(context, statusBarStateController, asyncSensorManager);

    }



    @Singleton

    @Provides

    @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)

    static boolean provideAllowNotificationLongPress() {

        return true;

    }

}

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

+16 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.systemui;



import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;



import com.android.systemui.fragments.FragmentService;

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

import com.android.systemui.util.InjectionInflationController;

import com.android.systemui.util.leak.GarbageMonitor;



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Component;
@@ -29,8 +32,13 @@ import dagger.Component; 
 * Root component for Dagger injection.

 */

@Singleton

@Component(modules = {SystemUIFactory.class, DependencyProvider.class, DependencyBinder.class,

        ServiceBinder.class, SystemUIFactory.ContextHolder.class})

@Component(modules = {

        DependencyProvider.class,

        DependencyBinder.class,

        ServiceBinder.class,

        SystemUIFactory.ContextHolder.class,

        SystemUIModule.class,

        SystemUIDefaultModule.class})

public interface SystemUIRootComponent {

    /**

     * Main dependency providing module.
@@ -61,6 +69,12 @@ public interface SystemUIRootComponent { 
    @Singleton

    GarbageMonitor createGarbageMonitor();



    /**

     * Whether notification long press is allowed.

     */

    @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)

    boolean allowNotificationLongPressName();



    /**

     * Injects into the supplied argument.

     */

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+5 −0
Original line number Diff line number Diff line
@@ -48,9 +48,13 @@ import com.android.systemui.recents.OverviewProxyService; 
import com.android.systemui.statusbar.CommandQueue;

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



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * Class to manage everything related to assist in SystemUI.

 */

@Singleton

public class AssistManager implements ConfigurationChangedReceiver {



    /**
@@ -149,6 +153,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        }

    };



    @Inject

    public AssistManager(DeviceProvisionedController controller, Context context) {

        mContext = context;

        mDeviceProvisionedController = controller;