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

Commit 76c63cc9 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix Duplicate Binding Warning for StatusBarFragmentComponent. 

The Component only needs the view, so just bind the view directly.
This makes dagger happy, as the Fragment was being bound twice.

Bug: 303693030
Test: built and saw no errors or warnings
Change-Id: I04786543266992f85986dbbf930d2fc32faf453d
parent 429b99da

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);

    }



    /**

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

+1 −11
Original line number Diff line number Diff line
@@ -19,15 +19,14 @@ package com.android.systemui.statusbar.phone.fragment.dagger; 
import android.view.View;

import android.view.ViewStub;



import com.android.systemui.res.R;

import com.android.systemui.battery.BatteryMeterView;

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

import com.android.systemui.res.R;

import com.android.systemui.statusbar.HeadsUpStatusBarView;

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.StatusBarLocation;

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;
@@ -49,15 +48,6 @@ public interface StatusBarFragmentModule { 
    String START_SIDE_CONTENT = "start_side_content";

    String END_SIDE_CONTENT = "end_side_content";



    /** */

    @Provides

    @RootView

    @StatusBarFragmentScope

    static PhoneStatusBarView providePhoneStatusBarView(

            CollapsedStatusBarFragment collapsedStatusBarFragment) {

        return (PhoneStatusBarView) collapsedStatusBarFragment.getView();

    }



    /** */

    @Provides

    @StatusBarFragmentScope