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

Unverified Commit b40e7ebc authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Revert "SignalClusterView: Hide signal icons for disabled SIMs" 

* This was accidentally merged

This reverts commit e6396d94.

Change-Id: I1b9865f055e3d471054a3d94633b334e3051ca13
parent 83f6424c

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

+2 −30
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.graphics.Color; 
import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.util.ArraySet;

import android.util.AttributeSet;

import android.util.Log;
@@ -54,16 +53,12 @@ import com.android.systemui.tuner.TunerService; 
import com.android.systemui.tuner.TunerService.Tunable;

import com.android.systemui.util.Utils.DisableStateTracker;



import org.lineageos.internal.util.TelephonyExtUtils;

import org.lineageos.internal.util.TelephonyExtUtils.ProvisioningChangedListener;



import java.util.ArrayList;

import java.util.List;



// Intimately tied to the design of res/layout/signal_cluster_view.xml

public class SignalClusterView extends LinearLayout implements NetworkControllerImpl.SignalCallback,

        SecurityController.SecurityControllerCallback, Tunable,

        DarkReceiver, ProvisioningChangedListener {

        SecurityController.SecurityControllerCallback, Tunable, DarkReceiver {



    static final String TAG = "SignalClusterView";

    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -152,23 +147,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController 
        addOnAttachStateChangeListener(

                new DisableStateTracker(DISABLE_NONE, DISABLE2_SYSTEM_ICONS));

        updateActivityEnabled();



        TelephonyExtUtils.getInstance(context).addListener(this);

    }



    @Override

    public void onProvisioningChanged(int slotId, boolean isProvisioned) {

        int[] subId = SubscriptionManager.getSubId(slotId);

        if (subId != null) {

            PhoneState state = getState(subId[0]);

            if (state != null) {

                state.mProvisioned = isProvisioned;

                if (!isProvisioned) {

                    state.mMobileVisible = false;

                }

            }

            apply();

        }

    }



    public void setForceBlockWifi() {
@@ -317,7 +295,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController 
        if (state == null) {

            return;

        }

        state.mMobileVisible = statusIcon.visible && !mBlockMobile && state.mProvisioned;

        state.mMobileVisible = statusIcon.visible && !mBlockMobile;

        state.mMobileStrengthId = statusIcon.icon;

        state.mMobileTypeId = statusType;

        state.mMobileDescription = statusIcon.contentDescription;
@@ -623,7 +601,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController 
    private class PhoneState {

        private final int mSubId;

        private boolean mMobileVisible = false;

        private boolean mProvisioned = true;

        private int mMobileStrengthId = 0, mMobileTypeId = 0;

        private int mLastMobileStrengthId = -1;

        private int mLastMobileTypeId = -1;
@@ -644,11 +621,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController 
                    .inflate(R.layout.mobile_signal_group, null);

            setViews(root);

            mSubId = subId;



            TelephonyExtUtils extTelephony = TelephonyExtUtils.getInstance(context);

            if (extTelephony.hasService()) {

                mProvisioned = extTelephony.isSubProvisioned(subId);

            }

        }



        public void setViews(ViewGroup root) {