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

Commit 09abf0d9 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove CentralSurfacesComponent and CentralSurfacesScope! 

The last piece of CentralSurfacesComponent was providing a way to
inflate CollapsedStatusBarFragment. This change makes the fragment
@Inject-able, so that it can just be instantiated via a Provider<>.

Fixes: 277762009
Test: manual: change font size -> verify CollapsedStatusBarFragment is
reinflated, and responds to subsequent changes (turning on/off DND,
turning on/off wifi, plugging in device)
Test: atest CentralSurfacesImplTest

Change-Id: Idb0b02e6113ef952fd3123681a643c8d726f8981
parent b5e861ee

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention; 
import javax.inject.Scope;



/**

 * Scope annotation for singleton items within the CentralSurfacesComponent.

 * Scope annotation for singleton items within the {@link KeyguardBouncerComponent}.

 */

@Documented

@Retention(RUNTIME)

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention; 
import javax.inject.Scope;



/**

 * Scope annotation for singleton items within the CentralSurfacesComponent.

 * Scope annotation for singleton items within the {@link KeyguardStatusBarViewComponent}.

 */

@Documented

@Retention(RUNTIME)

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention; 
import javax.inject.Scope;



/**

 * Scope annotation for singleton items within the CentralSurfacesComponent.

 * Scope annotation for singleton items within the {@link KeyguardStatusViewComponent}.

 */

@Documented

@Retention(RUNTIME)

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

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.systemui.statusbar.phone.DozeServiceHost; 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

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

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

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule;

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -95,6 +96,7 @@ import javax.inject.Named; 
@Module(includes = {

        AospPolicyModule.class,

        BatterySaverModule.class,

        CollapsedStatusBarFragmentStartableModule.class,

        GestureModule.class,

        MediaModule.class,

        MultiUserUtilsModule.class,

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

+0 −2
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfC 
import com.android.systemui.statusbar.phone.CentralSurfaces;

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

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

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

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;

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

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -219,7 +218,6 @@ import javax.inject.Named; 
            WalletModule.class

        },

        subcomponents = {

            CentralSurfacesComponent.class,

            ComplicationComponent.class,

            NavigationBarComponent.class,

            NotificationRowComponent.class,