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

Commit 270ef625 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Move SystemBarAttributesListener's bind into SBFragmentComponent. 

For b/277762009, we'll want to eventually delete StatusBarViewModule
which means we need to move this @Binds @IntoSet somewhere else.

Bug: 277762009
Test: manual: verified via logging that SystemBarAttributesListener gets
status bar bounds updates on rotation

Change-Id: I8b5c205c2620a70212cf9303c6ce30398b55dd37
parent 61a737c6

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −9
Original line number Diff line number Diff line
@@ -27,11 +27,9 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.OperatorNameViewController;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent;
@@ -43,10 +41,8 @@ import com.android.systemui.statusbar.window.StatusBarWindowStateController; 
import com.android.systemui.util.CarrierConfigTracker;

import com.android.systemui.util.settings.SecureSettings;



import dagger.Binds;

import dagger.Module;

import dagger.Provides;

import dagger.multibindings.IntoSet;



import java.util.concurrent.Executor;
@@ -64,11 +60,6 @@ public abstract class StatusBarViewModule { 


    public static final String STATUS_BAR_FRAGMENT = "status_bar_fragment";



    @Binds

    @IntoSet

    abstract StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener(

            SystemBarAttributesListener systemBarAttributesListener);



    /**

     * Creates a new {@link CollapsedStatusBarFragment}.

     *

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarFragmentModule.java

+13 −4
Original line number Diff line number Diff line
@@ -26,20 +26,23 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarTransitions; 
import com.android.systemui.statusbar.phone.PhoneStatusBarView;

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

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

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

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

import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer;

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

import com.android.systemui.statusbar.window.StatusBarWindowController;



import dagger.Binds;

import dagger.Module;

import dagger.Provides;

import dagger.multibindings.IntoSet;

import dagger.multibindings.Multibinds;



import java.util.Optional;

import java.util.Set;



import javax.inject.Named;



import dagger.Module;

import dagger.Provides;

import dagger.multibindings.Multibinds;



/** Dagger module for {@link StatusBarFragmentComponent}. */

@Module

public interface StatusBarFragmentModule {
@@ -151,4 +154,10 @@ public interface StatusBarFragmentModule { 
    /** */

    @Multibinds

    Set<StatusBarBoundsProvider.BoundsChangeListener> boundsChangeListeners();



    /** */

    @Binds

    @IntoSet

    StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener(

            SystemBarAttributesListener systemBarAttributesListener);

}