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

Commit cf05fd9d authored by Evan Rosky's avatar Evan Rosky
Browse files

Consolidate Divider Provider 

Bug: 146670576
Test: builds/runs
Change-Id: Ib5ca2cb73d7e453940fb2e07dd7a6dcfa12c00ce
parent ac8356bd

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

+2 −11
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.power.EnhancedEstimates; 
import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.DividerModule;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
@@ -52,17 +52,14 @@ import com.android.systemui.statusbar.policy.HeadsUpManager; 
import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;



import java.util.Optional;



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Binds;

import dagger.Lazy;

import dagger.Module;

import dagger.Provides;



@Module

@Module(includes = {DividerModule.class})

abstract class CarSystemUIModule {



    @Binds
@@ -83,12 +80,6 @@ abstract class CarSystemUIModule { 
    abstract NotificationEntryManager bindNotificationEntryManager(

            CarNotificationEntryManager notificationEntryManager);



    @Singleton

    @Provides

    static Divider provideDivider(Context context, Optional<Lazy<Recents>> recentsOptionalLazy) {

        return new Divider(context, recentsOptionalLazy);

    }



    @Singleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,

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

+2 −11
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.systemui.power.EnhancedEstimates; 
import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.DividerModule;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
@@ -44,13 +44,10 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl;

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



import java.util.Optional;



import javax.inject.Named;

import javax.inject.Singleton;



import dagger.Binds;

import dagger.Lazy;

import dagger.Module;

import dagger.Provides;
@@ -58,7 +55,7 @@ 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

@Module(includes = {DividerModule.class})

abstract class SystemUIDefaultModule {



    @Singleton
@@ -93,12 +90,6 @@ abstract class SystemUIDefaultModule { 
        return true;

    }



    @Singleton

    @Provides

    static Divider provideDivider(Context context, Optional<Lazy<Recents>> recentsOptionalLazy) {

        return new Divider(context, recentsOptionalLazy);

    }



    @Singleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,

packages/SystemUI/src/com/android/systemui/stackdivider/DividerModule.java

0 → 100644
+41 −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.stackdivider;



import android.content.Context;



import com.android.systemui.recents.Recents;



import java.util.Optional;



import javax.inject.Singleton;



import dagger.Lazy;

import dagger.Module;

import dagger.Provides;



/**

 * Module which provides a Divider.

 */

@Module

public class DividerModule {

    @Singleton

    @Provides

    static Divider provideDivider(Context context, Optional<Lazy<Recents>> recentsOptionalLazy) {

        return new Divider(context, recentsOptionalLazy);

    }

}