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

Commit 6d2c21ee authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge changes from topic "statusbarmodule-descope" into main 

* changes:
  [sb] StatusBarInitializer to CoreStartable
  [sb] re-claim StatusBarPhoneModule for phones only
parents 6f34b03f d84ed808

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

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -136,6 +137,7 @@ import javax.inject.Named; 
        RotationLockModule.class,

        RotationLockNewModule.class,

        ScreenDecorationsModule.class,

        StatusBarPhoneModule.class,

        SystemActionsModule.class,

        ShadeModule.class,

        StartCentralSurfacesModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

+30 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.systemui.statusbar.core



import android.app.Fragment

import androidx.annotation.VisibleForTesting

import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.fragments.FragmentHostManager

import com.android.systemui.res.R
@@ -72,11 +74,38 @@ constructor( 
    private val windowController: StatusBarWindowController,

    private val collapsedStatusBarFragmentProvider: Provider<CollapsedStatusBarFragment>,

    private val creationListeners: Set<@JvmSuppressWildcards OnStatusBarViewInitializedListener>,

) : StatusBarInitializer {

) : CoreStartable, StatusBarInitializer {

    private var component: StatusBarFragmentComponent? = null



    @get:VisibleForTesting

    var initialized = false

        private set



    override var statusBarViewUpdatedListener: OnStatusBarViewUpdatedListener? = null

        set(value) {

            field = value

            // If a listener is added after initialization, immediately call the callback

            component?.let { component ->

                field?.onStatusBarViewUpdated(

                    component.phoneStatusBarViewController,

                    component.phoneStatusBarTransitions,

                )

            }

        }



    override fun start() {

        if (StatusBarSimpleFragment.isEnabled) {

            doStart()

        }

    }



    override fun initializeStatusBar() {

        StatusBarSimpleFragment.assertInLegacyMode()

        doStart()

    }



    private fun doStart() {

        initialized = true

        windowController.fragmentHostManager

            .addTagListener(

                CollapsedStatusBarFragment.TAG,

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java

+14 −3
Original line number Diff line number Diff line
@@ -16,17 +16,28 @@ 


package com.android.systemui.statusbar.dagger;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.emergency.EmergencyGestureModule;

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

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

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

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

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

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



import dagger.Binds;

import dagger.Module;



/**  */

/**

 * Dagger Module providing {@link CentralSurfacesImpl}.

 */

@Module(includes = {CentralSurfacesDependenciesModule.class,

        StatusBarNotificationPresenterModule.class, StatusBarPhoneModule.class,

        StatusBarNotificationPresenterModule.class,

        NotificationsModule.class, NotificationRowModule.class, EmergencyGestureModule.class})

public interface CentralSurfacesModule {

    /**

     * Provides our instance of CentralSurfaces which is considered optional.

     */

    @Binds

    @SysUISingleton

    CentralSurfaces bindsCentralSurfaces(CentralSurfacesImpl impl);

}

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt

+0 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import com.android.systemui.CoreStartable 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogBufferFactory

import com.android.systemui.statusbar.core.StatusBarInitializer

import com.android.systemui.statusbar.core.StatusBarInitializerImpl

import com.android.systemui.statusbar.data.StatusBarDataLayerModule

import com.android.systemui.statusbar.phone.LightBarController

import com.android.systemui.statusbar.phone.StatusBarSignalPolicy
@@ -63,8 +61,6 @@ abstract class StatusBarModule { 
    @ClassKey(StatusBarSignalPolicy::class)

    abstract fun bindStatusBarSignalPolicy(impl: StatusBarSignalPolicy): CoreStartable



    @Binds abstract fun statusBarInitializer(impl: StatusBarInitializerImpl): StatusBarInitializer



    companion object {



        @Provides

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+5 −1
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ import com.android.systemui.statusbar.PulseExpansionHandler; 
import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.core.StatusBarInitializer;

import com.android.systemui.statusbar.core.StatusBarSimpleFragment;

import com.android.systemui.statusbar.data.model.StatusBarMode;

import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore;

import com.android.systemui.statusbar.notification.NotificationActivityStarter;
@@ -1204,7 +1205,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                    setBouncerShowingForStatusBarComponents(mBouncerShowing);

                    checkBarModes();

                });

        // When the flag is on, we register the fragment as a core startable and this is not needed

        if (!StatusBarSimpleFragment.isEnabled()) {

            mStatusBarInitializer.initializeStatusBar();

        }



        mStatusBarTouchableRegionManager.setup(getNotificationShadeWindowView());