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

Commit 1e8d8026 authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-19436880-revert-19279477-UFVLVIEMJU-NPEBAMHHJM" into tm-qpr-dev 

* changes:
  Remove remaining references to COMBINED_STATUS_BAR_SIGNAL_FLAGS
  Revert^2 "Remove support for COMBINED_SIGNAL_ICONS"
  Revert^2 "Create a MobileStatusTrackerFactory"
  Revert^2 "Change from deprecated telephony api"
  Revert^2 "[Cleanup] Order NetworkController's intent filters"
  Revert^2 "Add an @Inject-able MobileSignalControllerFactory"
parents 9f8a5c02 36928c08

packages/SettingsLib/src/com/android/settingslib/mobile/MobileStatusTracker.java

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ public class MobileStatusTracker { 
    private final Handler mReceiverHandler;

    private final MobileTelephonyCallback mTelephonyCallback;



    private boolean mListening = false;



    /**

     * MobileStatusTracker constructors

     *
@@ -76,6 +78,7 @@ public class MobileStatusTracker { 
     * Config the MobileStatusTracker to start or stop monitoring platform signals.

     */

    public void setListening(boolean listening) {

        mListening = listening;

        if (listening) {

            mPhone.registerTelephonyCallback(mReceiverHandler::post, mTelephonyCallback);

        } else {
@@ -83,6 +86,10 @@ public class MobileStatusTracker { 
        }

    }



    public boolean isListening() {

        return mListening;

    }



    private void updateDataSim() {

        int activeDataSubId = mDefaults.getActiveDataSubId();

        if (SubscriptionManager.isValidSubscriptionId(activeDataSubId)) {

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

+0 −3
Original line number Diff line number Diff line
@@ -145,9 +145,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/qs/QuickStatusBarHeaderController.java

+3 −12
Original line number Diff line number Diff line
@@ -134,18 +134,9 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
        mQSCarrierGroupController

                .setOnSingleCarrierChangedListener(mView::setIsSingleCarrier);



        List<String> rssiIgnoredSlots;



        if (mFeatureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS)) {

            rssiIgnoredSlots = List.of(

                    getResources().getString(com.android.internal.R.string.status_bar_no_calling),

                    getResources().getString(com.android.internal.R.string.status_bar_call_strength)

            );

        } else {

            rssiIgnoredSlots = List.of(

        List<String> rssiIgnoredSlots = List.of(

                getResources().getString(com.android.internal.R.string.status_bar_mobile)

        );

        }



        mView.onAttach(mIconManager, mQSExpansionPathInterpolator, rssiIgnoredSlots,

                mInsetsProvider, mFeatureFlags.isEnabled(Flags.COMBINED_QS_HEADERS));

packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ data class CellSignalState( 
    @JvmField val contentDescription: String? = null,

    @JvmField val typeContentDescription: String? = null,

    @JvmField val roaming: Boolean = false,

    @JvmField val providerModelBehavior: Boolean = false

) {

    /**

     * Changes the visibility of this state by returning a copy with the visibility changed.

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java

+19 −29
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class QSCarrier extends LinearLayout { 
    private View mSpacer;

    @Nullable

    private CellSignalState mLastSignalState;

    private boolean mProviderModelInitialized = false;

    private boolean mMobileSignalInitialized = false;

    private boolean mIsSingleCarrier;



    public QSCarrier(Context context) {
@@ -96,17 +96,8 @@ public class QSCarrier extends LinearLayout { 
            mMobileRoaming.setImageTintList(colorStateList);

            mMobileSignal.setImageTintList(colorStateList);



            if (state.providerModelBehavior) {

                if (!mProviderModelInitialized) {

                    mProviderModelInitialized = true;

                    mMobileSignal.setImageDrawable(

                            mContext.getDrawable(R.drawable.ic_qs_no_calling_sms));

                }

                mMobileSignal.setImageDrawable(mContext.getDrawable(state.mobileSignalIconId));

                mMobileSignal.setContentDescription(state.contentDescription);

            } else {

                if (!mProviderModelInitialized) {

                    mProviderModelInitialized = true;

            if (!mMobileSignalInitialized) {

                mMobileSignalInitialized = true;

                mMobileSignal.setImageDrawable(new SignalDrawable(mContext));

            }

            mMobileSignal.setImageLevel(state.mobileSignalIconId);
@@ -125,7 +116,6 @@ public class QSCarrier extends LinearLayout { 
            }

            mMobileSignal.setContentDescription(contentDescription);

        }

        }

        return true;

    }