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

Commit 36928c08 authored by Evan Laird's avatar Evan Laird
Browse files

Remove remaining references to COMBINED_STATUS_BAR_SIGNAL_FLAGS 

The previous CL removes all implementationso f the provider model
combined iconography + call strength policy from the signal controllers.
This CL removes the remaining handful of references fo the flag which
could change some of our layouts.

Test: atest SystemUITests
Test: manual
Bug: 238873748
Change-Id: If36675acbea5c2f1f250fd526a0877e2a59fb3f3
parent 9273f914

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+0 −3
Original line number Diff line number Diff line
@@ -139,9 +139,6 @@ public class Flags { 


    /***************************************/

    // 600- status bar

    public static final BooleanFlag COMBINED_STATUS_BAR_SIGNAL_ICONS =

            new BooleanFlag(601, false);



    public static final ResourceBooleanFlag STATUS_BAR_USER_SWITCHER =

            new ResourceBooleanFlag(602, R.bool.flag_user_switcher_chip);

packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt

+1 −7
Original line number Diff line number Diff line
@@ -264,14 +264,8 @@ class LargeScreenShadeHeaderController @Inject constructor( 
            Utils.getColorAttrDefaultColor(header.context, android.R.attr.textColorPrimary)

        )



        carrierIconSlots = if (featureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS)) {

            listOf(

                header.context.getString(com.android.internal.R.string.status_bar_no_calling),

                header.context.getString(com.android.internal.R.string.status_bar_call_strength)

            )

        } else {

        carrierIconSlots =

            listOf(header.context.getString(com.android.internal.R.string.status_bar_mobile))

        }

        qsCarrierGroupController = qsCarrierGroupControllerBuilder

            .setQSCarrierGroup(qsCarrierGroup)

            .build()

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java

+4 −11
Original line number Diff line number Diff line
@@ -61,21 +61,19 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, 
    private int mVisibleState = -1;

    private DualToneHandler mDualToneHandler;

    private boolean mForceHidden;

    private boolean mProviderModel;



    /**

     * Designated constructor

     */

    public static StatusBarMobileView fromContext(

            Context context,

            String slot,

            boolean providerModel

            String slot

    ) {

        LayoutInflater inflater = LayoutInflater.from(context);

        StatusBarMobileView v = (StatusBarMobileView)

                inflater.inflate(R.layout.status_bar_mobile_signal_group, null);

        v.setSlot(slot);

        v.init(providerModel);

        v.init();

        v.setVisibleState(STATE_ICON);

        return v;

    }
@@ -108,17 +106,12 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, 
        outRect.bottom += translationY;

    }



    private void init(boolean providerModel) {

        mProviderModel = providerModel;

    private void init() {

        mDualToneHandler = new DualToneHandler(getContext());

        mMobileGroup = findViewById(R.id.mobile_group);

        mMobile = findViewById(R.id.mobile_signal);

        mMobileType = findViewById(R.id.mobile_type);

        if (mProviderModel) {

            mMobileRoaming = findViewById(R.id.mobile_roaming_large);

        } else {

        mMobileRoaming = findViewById(R.id.mobile_roaming);

        }

        mMobileRoamingSpace = findViewById(R.id.mobile_roaming_space);

        mIn = findViewById(R.id.mobile_in);

        mOut = findViewById(R.id.mobile_out);

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

+1 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.internal.statusbar.StatusBarIcon; 
import com.android.systemui.R;

import com.android.systemui.demomode.DemoMode;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.statusbar.StatusBarIconView;
@@ -255,9 +254,7 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 


    public void addMobileView(MobileIconState state) {

        Log.d(TAG, "addMobileView: ");

        StatusBarMobileView view = StatusBarMobileView.fromContext(

                mContext, state.slot,

                mFeatureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS));

        StatusBarMobileView view = StatusBarMobileView.fromContext(mContext, state.slot);



        view.applyMobileState(state);

        view.setStaticDrawableColor(mColor);

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

+1 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.R; 
import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.demomode.DemoModeCommandReceiver;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.statusbar.StatusBarIconView;
@@ -361,9 +360,7 @@ public interface StatusBarIconController { 
        }



        private StatusBarMobileView onCreateStatusBarMobileView(String slot) {

            StatusBarMobileView view = StatusBarMobileView.fromContext(

                            mContext, slot,

                    mFeatureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS));

            StatusBarMobileView view = StatusBarMobileView.fromContext(mContext, slot);

            return view;

        }