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

Commit 2696247b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[CS] Move SystemBarAttributesListener's bind into SBFragmentComponent."... 

Merge "[CS] Move SystemBarAttributesListener's bind into SBFragmentComponent." into udc-qpr-dev am: f93b8d67

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23814725



Change-Id: Ib7b92d4a12556111a9d4aa158927e22e638228b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a798a32 f93b8d67

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
@@ -27,20 +27,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 {
@@ -152,4 +155,10 @@ public interface StatusBarFragmentModule { 
    /** */

    @Multibinds

    Set<StatusBarBoundsProvider.BoundsChangeListener> boundsChangeListeners();



    /** */

    @Binds

    @IntoSet

    StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener(

            SystemBarAttributesListener systemBarAttributesListener);

}