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

Commit e33c26e4 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes I974d6b2b,I04786543 into main 

* changes:
  Fix Duplicate Binding Warning for QSFragmentComponent
  Fix Duplicate Binding Warning for StatusBarFragmentComponent.
parents f74687c7 1256c0e1

packages/SystemUI/src/com/android/systemui/qs/QSFragmentLegacy.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class QSFragmentLegacy extends LifecycleFragment implements QS { 


    @Override

    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {

        QSFragmentComponent qsFragmentComponent = mQsComponentFactory.create(this);

        QSFragmentComponent qsFragmentComponent = mQsComponentFactory.create(getView());

        mQsImpl = mQsImplProvider.get();

        mQsImpl.onComponentCreated(qsFragmentComponent, savedInstanceState);

    }

packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.systemui.qs.dagger;



import android.view.View;



import com.android.systemui.dagger.qualifiers.RootView;

import com.android.systemui.qs.QSFragmentLegacy;



import dagger.BindsInstance;
@@ -31,6 +34,7 @@ public interface QSFragmentComponent extends QSComponent { 
    /** Factory for building a {@link QSFragmentComponent}. */

    @Subcomponent.Factory

    interface Factory {

        QSFragmentComponent create(@BindsInstance QSFragmentLegacy qsFragment);

        /** */

        QSFragmentComponent create(@BindsInstance @RootView View view);

    }

}

packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentModule.java

+2 −19
Original line number Diff line number Diff line
@@ -20,34 +20,17 @@ import static com.android.systemui.util.Utils.useCollapsedMediaInLandscape; 
import static com.android.systemui.util.Utils.useQsMediaPlayer;



import android.content.Context;

import android.view.View;



import com.android.systemui.dagger.qualifiers.RootView;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.QSFragmentLegacy;



import javax.inject.Named;



import dagger.Binds;

import dagger.Module;

import dagger.Provides;



import javax.inject.Named;



/**

 * Dagger Module for {@link QSFragmentComponent}.

 */

@Module(includes = {QSScopeModule.class})

public  interface QSFragmentModule {



    @Provides

    @RootView

    static View provideRootView(QSFragmentLegacy qsFragment) {

        return qsFragment.getView();

    }



    /** */

    @Binds

    QS bindQS(QSFragmentLegacy qsFragment);



    /** */

    @Provides

    @Named(QSScopeModule.QS_USING_MEDIA_PLAYER)

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

+4 −4
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ import com.android.app.animation.Interpolators; 
import com.android.app.animation.InterpolatorsAndroidX;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.Dumpable;

import com.android.systemui.res.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.res.R;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.statusbar.CommandQueue;
@@ -74,8 +74,6 @@ import com.android.systemui.util.CarrierConfigTracker.CarrierConfigChangedListen 
import com.android.systemui.util.CarrierConfigTracker.DefaultDataSubscriptionChangedListener;

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



import kotlin.Unit;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;
@@ -85,6 +83,7 @@ import java.util.Set; 
import java.util.concurrent.Executor;



import javax.inject.Inject;

import kotlin.Unit;



/**

 * Contains the collapsed status bar and handles hiding/showing based on disable flags
@@ -279,7 +278,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

        mDumpManager.registerDumpable(getClass().getSimpleName(), this);

        mStatusBarFragmentComponent = mStatusBarFragmentComponentFactory.create(this);

        mStatusBarFragmentComponent = mStatusBarFragmentComponentFactory.create(

                (PhoneStatusBarView) getView());

        mStatusBarFragmentComponent.init();

        mStartableStates.clear();

        for (Startable startable : mStatusBarFragmentComponent.getStartables()) {

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

+3 −3
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ import com.android.systemui.statusbar.phone.StatusBarBoundsProvider; 
import com.android.systemui.statusbar.phone.StatusBarDemoMode;

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



import java.util.Set;



import dagger.BindsInstance;

import dagger.Subcomponent;



import java.util.Set;



/**

 * A subcomponent that gets re-created each time we create a new {@link CollapsedStatusBarFragment}.

 *
@@ -54,7 +54,7 @@ public interface StatusBarFragmentComponent { 
    @Subcomponent.Factory

    interface Factory {

        StatusBarFragmentComponent create(

                @BindsInstance CollapsedStatusBarFragment collapsedStatusBarFragment);

                @BindsInstance @RootView PhoneStatusBarView phoneStatusBarView);

    }



    /**