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

Commit 425b0b1f authored by Adnan Begovic's avatar Adnan Begovic Committed by Abhisek Devkota
Browse files

Revert "Hide msim 'no-sim' icons" 

This provides inconsistent behavior and confuses the user.

This reverts commit 83ca073e.

Change-Id: Ic010b9b3866ced970e0fbef55253caab651c9481
parent b14e5994

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+15 −0
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ 
                android:layout_width="wrap_content"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <ImageView
@@ -234,6 +239,11 @@ 
                android:layout_width="wrap_content"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <ImageView
@@ -310,6 +320,11 @@ 
                android:layout_width="wrap_content"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <ImageView

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

+19 −7
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public class MSimSignalClusterView 
    ViewGroup mWifiGroup;

    ViewGroup[] mMobileGroup;

    ImageView mWifi, mWifiActivity, mAirplane;

    ImageView[] mNoSimSlot;

    ImageView[] mMobile;

    ImageView[] mMobileRoam;

    ImageView[] mMobileActivity;
@@ -115,6 +116,7 @@ public class MSimSignalClusterView 
                                        R.id.mobile_inout_sub3};

    private int[] mMobileTypeResourceId = {R.id.mobile_type, R.id.mobile_type_sub2,

                                         R.id.mobile_type_sub3};

    private int[] mNoSimSlotResourceId = {R.id.no_sim, R.id.no_sim_slot2, R.id.no_sim_slot3};

    private int[] mDataGroupResourceId = {R.id.data_combo, R.id.data_combo_sub2,

                                        R.id.data_combo_sub3};

    private int[] mDataActResourceId = {R.id.data_inout, R.id.data_inout_sub2,
@@ -144,6 +146,7 @@ public class MSimSignalClusterView 
        mMobileActivityId = new int[mNumPhones];

        mNoSimIconId = new int[mNumPhones];

        mMobileGroup = new ViewGroup[mNumPhones];

        mNoSimSlot = new ImageView[mNumPhones];

        mMobile = new ImageView[mNumPhones];

        mMobileActivity = new ImageView[mNumPhones];

        mMobileRoam = new ImageView[mNumPhones];
@@ -198,6 +201,7 @@ public class MSimSignalClusterView 
            mMobileRoam[i]     = (ImageView) findViewById(mMobileRoamResourceId[i]);

            mMobileActivity[i] = (ImageView) findViewById(mMobileActResourceId[i]);

            mMobileType[i]     = (ImageView) findViewById(mMobileTypeResourceId[i]);

            mNoSimSlot[i]      = (ImageView) findViewById(mNoSimSlotResourceId[i]);



            mDataGroup[i]      = (ViewGroup) findViewById(mDataGroupResourceId[i]);

            mDataActivity[i]   = (ImageView) findViewById(mDataActResourceId[i]);
@@ -232,6 +236,7 @@ public class MSimSignalClusterView 
            mMobile[i]         = null;

            mMobileActivity[i] = null;

            mMobileType[i]     = null;

            mNoSimSlot[i]      = null;

            mDataGroup[i]      = null;

            mDataActivity[i]   = null;

            mMobileDataVoiceGroup[i] = null;
@@ -411,6 +416,10 @@ public class MSimSignalClusterView 
            if (mMobileType[i] != null) {

                mMobileType[i].setImageDrawable(null);

            }

            if (mNoSimSlot[i] != null) {

                mNoSimSlot[i].setImageDrawable(null);

            }



            apply(i);

        }

    }
@@ -432,7 +441,7 @@ public class MSimSignalClusterView 
                String.format("wifi: %s sig=%d act=%d",

                (mWifiVisible ? "VISIBLE" : "GONE"), mWifiStrengthId, mWifiActivityId));



        if ((mMobileVisible && mNoSimIconId[phoneId] == 0) && !mIsAirplaneMode) {

        if (mMobileVisible && !mIsAirplaneMode) {

            updateMobile(phoneId);

            updateCdma();

            updateData(phoneId);
@@ -472,8 +481,10 @@ public class MSimSignalClusterView 


        if (mStyle != STATUS_BAR_STYLE_ANDROID_DEFAULT) {

            if (mNoSimIconId[phoneId] != 0) {

                mNoSimSlot[phoneId].setVisibility(View.VISIBLE);

                mMobile[phoneId].setVisibility(View.GONE);

            } else {

                mNoSimSlot[phoneId].setVisibility(View.GONE);

                mMobile[phoneId].setVisibility(View.VISIBLE);

            }

        }
@@ -495,6 +506,7 @@ public class MSimSignalClusterView 
            + mMobileDescription[phoneId]);

        mMobileActivity[phoneId].setImageResource(mMobileActivityId[phoneId]);

        mMobileType[phoneId].setImageResource(mMobileTypeId[phoneId]);

        mNoSimSlot[phoneId].setImageResource(mNoSimIconId[phoneId]);

        mMobileRoam[phoneId].setImageResource(mMobileRoamId[phoneId]);

    }