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

Commit b1a38ed0 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Do not show 'no sims' icon in status bar.

Bug: 72540392
Test: visual
Change-Id: I604b4af937753655b3ed4c5e1e4b9973a95126b2
parent 3eef2efe
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -115,27 +115,6 @@
        android:layout_width="wrap_content"
        >
    </LinearLayout>
    <FrameLayout
        android:id="@+id/no_sims_combo"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:contentDescription="@string/accessibility_no_sims">
        <com.android.systemui.statusbar.AlphaOptimizedImageView
            android:theme="?attr/lightIconTheme"
            android:id="@+id/no_sims"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:src="@drawable/stat_sys_no_sims"
            />
        <com.android.systemui.statusbar.AlphaOptimizedImageView
            android:theme="?attr/darkIconTheme"
            android:id="@+id/no_sims_dark"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:src="@drawable/stat_sys_no_sims"
            android:alpha="0.0"
            />
    </FrameLayout>
    <View
        android:id="@+id/wifi_airplane_spacer"
        android:layout_width="@dimen/status_bar_airplane_spacer_width"
+4 −46
Original line number Diff line number Diff line
@@ -73,9 +73,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController
    private final NetworkController mNetworkController;
    private final SecurityController mSecurityController;

    private boolean mNoSimsVisible = false;
    private boolean mVpnVisible = false;
    private boolean mSimDetected;
    private int mVpnIconId = 0;
    private int mLastVpnIconId = -1;
    private boolean mEthernetVisible = false;
@@ -86,7 +84,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController
    private int mLastWifiStrengthId = -1;
    private boolean mWifiIn;
    private boolean mWifiOut;
    private int mLastWifiActivityId = -1;
    private boolean mIsAirplaneMode = false;
    private int mAirplaneIconId = 0;
    private int mLastAirplaneIconId = -1;
@@ -99,8 +96,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController
    private final Rect mTintArea = new Rect();

    ViewGroup mEthernetGroup, mWifiGroup;
    View mNoSimsCombo;
    ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark;
    ImageView mVpn, mEthernet, mWifi, mAirplane, mEthernetDark, mWifiDark;
    ImageView mWifiActivityIn;
    ImageView mWifiActivityOut;
    View mWifiAirplaneSpacer;
@@ -203,9 +199,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController
        mWifiActivityIn = findViewById(R.id.wifi_in);
        mWifiActivityOut= findViewById(R.id.wifi_out);
        mAirplane       = findViewById(R.id.airplane);
        mNoSims         = findViewById(R.id.no_sims);
        mNoSimsDark     = findViewById(R.id.no_sims_dark);
        mNoSimsCombo    =             findViewById(R.id.no_sims_combo);
        mWifiAirplaneSpacer =         findViewById(R.id.wifi_airplane_spacer);
        mWifiSignalSpacer =           findViewById(R.id.wifi_signal_spacer);
        mMobileSignalGroup =          findViewById(R.id.mobile_signal_group);
@@ -224,11 +217,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController
        }

        mVpn.setImageDrawable(new ScalingDrawableWrapper(mVpn.getDrawable(), mIconScaleFactor));

        mNoSims.setImageDrawable(
                new ScalingDrawableWrapper(mNoSims.getDrawable(), mIconScaleFactor));
        mNoSimsDark.setImageDrawable(
                new ScalingDrawableWrapper(mNoSimsDark.getDrawable(), mIconScaleFactor));
    }

    @Override
@@ -333,9 +321,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController

    @Override
    public void setNoSims(boolean show, boolean simDetected) {
        mNoSimsVisible = show && !mBlockMobile;
        mSimDetected = simDetected;
        apply();
        // Noop. Status bar no longer shows no sim icon.
    }

    @Override
@@ -545,38 +531,13 @@ public class SignalClusterView extends LinearLayout implements NetworkController
            mWifiAirplaneSpacer.setVisibility(View.GONE);
        }

        if (((anyMobileVisible && firstMobileTypeId != 0) || mNoSimsVisible) && mWifiVisible) {
        if ((anyMobileVisible && firstMobileTypeId != 0) && mWifiVisible) {
            mWifiSignalSpacer.setVisibility(View.VISIBLE);
        } else {
            mWifiSignalSpacer.setVisibility(View.GONE);
        }

        if (mNoSimsVisible) {
            mIconLogger.onIconShown(SLOT_MOBILE);
            mNoSimsCombo.setVisibility(View.VISIBLE);
            if (!Objects.equals(mSimDetected, mNoSimsCombo.getTag())) {
                mNoSimsCombo.setTag(mSimDetected);
                if (mSimDetected) {
                    SignalDrawable d = new SignalDrawable(mNoSims.getContext());
                    d.setDarkIntensity(0);
                    mNoSims.setImageDrawable(d);
                    mNoSims.setImageLevel(SignalDrawable.getEmptyState(4));

                    SignalDrawable dark = new SignalDrawable(mNoSims.getContext());
                    dark.setDarkIntensity(1);
                    mNoSimsDark.setImageDrawable(dark);
                    mNoSimsDark.setImageLevel(SignalDrawable.getEmptyState(4));
                } else {
                    mNoSims.setImageResource(R.drawable.stat_sys_no_sims);
                    mNoSimsDark.setImageResource(R.drawable.stat_sys_no_sims);
                }
            }
        } else {
            mIconLogger.onIconHidden(SLOT_MOBILE);
            mNoSimsCombo.setVisibility(View.GONE);
        }

        boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode
        boolean anythingVisible = mWifiVisible || mIsAirplaneMode
                || anyMobileVisible || mVpnVisible || mEthernetVisible;
        setPaddingRelative(0, 0, anythingVisible ? mEndPadding : mEndPaddingNothingVisible, 0);
    }
@@ -612,9 +573,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController
    private void applyIconTint() {
        setTint(mVpn, DarkIconDispatcher.getTint(mTintArea, mVpn, mIconTint));
        setTint(mAirplane, DarkIconDispatcher.getTint(mTintArea, mAirplane, mIconTint));
        applyDarkIntensity(
                DarkIconDispatcher.getDarkIntensity(mTintArea, mNoSims, mDarkIntensity),
                mNoSims, mNoSimsDark);
        applyDarkIntensity(
                DarkIconDispatcher.getDarkIntensity(mTintArea, mWifi, mDarkIntensity),
                mWifi, mWifiDark);