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

Commit 4d5c8cb6 authored by Roman Birg's avatar Roman Birg
Browse files

SystemUI: hide msim no-sim icons 



Simply hide the SIM mobile indicator group when a no SIM icon is
requested.

Change-Id: I074b8e486ab35f57daa1f1eaee7e5b696835b3b8
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 9ab550f6

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+0 −15
Original line number Diff line number Diff line
@@ -116,11 +116,6 @@ 
                    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>

        </LinearLayout>

    </FrameLayout>
@@ -164,11 +159,6 @@ 
                    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>

        </LinearLayout>

    </FrameLayout>
@@ -212,11 +202,6 @@ 
                    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>

        </LinearLayout>

    </FrameLayout>

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

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

    ViewGroup[] mMobileGroup;

    ImageView mWifi, mWifiActivity, mAirplane;

    ImageView[] mNoSimSlot;

    TextView[] mMobileSlot;

    ImageView[] mMobile;

    ImageView[] mMobileActivity;
@@ -84,7 +83,6 @@ 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 mNumPhones = MSimTelephonyManager.getDefault().getPhoneCount();



    public MSimSignalClusterView(Context context) {
@@ -103,7 +101,6 @@ public class MSimSignalClusterView 
        mMobileActivityId = new int[mNumPhones];

        mNoSimIconId = new int[mNumPhones];

        mMobileGroup = new ViewGroup[mNumPhones];

        mNoSimSlot = new ImageView[mNumPhones];

        mMobileSlot = new TextView[mNumPhones];

        mMobile = new ImageView[mNumPhones];

        mMobileActivity = new ImageView[mNumPhones];
@@ -137,7 +134,6 @@ public class MSimSignalClusterView 
            mMobile[i]         = (ImageView) findViewById(mMobileResourceId[i]);

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

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

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

        }

        applySubscription(MSimTelephonyManager.getDefault().getDefaultSubscription());

    }
@@ -155,7 +151,6 @@ public class MSimSignalClusterView 
            mMobile[i]         = null;

            mMobileActivity[i] = null;

            mMobileType[i]     = null;

            mNoSimSlot[i]      = null;

        }

        super.onDetachedFromWindow();

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

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



        if (mMobileVisible && !mIsAirplaneMode) {

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

            mMobileGroup[subscription].setVisibility(View.VISIBLE);

            mMobileSlot[subscription].setText(mMobileSlotString[subscription]);

            mMobile[subscription].setImageResource(mMobileStrengthId[subscription]);
@@ -236,7 +231,6 @@ public class MSimSignalClusterView 
            mMobileType[subscription].setImageResource(mMobileTypeId[subscription]);

            mMobileType[subscription].setVisibility(

                !mWifiVisible ? View.VISIBLE : View.GONE);

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

        } else {

            mMobileGroup[subscription].setVisibility(View.GONE);

        }