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

Commit e16ce208 authored by Haiyang Liu's avatar Haiyang Liu
Browse files

StatusBar: Fix icons overlapped issue under CT mode 

1. Fix two icons overlapped issue when DUT attaches to EVDO
   network under CT mode.

2. Fix no sim icon and 1x only icon overlapped issue when
   DUT is attaching to networks and plugging out SIM
   card under CT mode.

CRs-Fixed: 638972

Change-Id: I2f0929112f1a1b6b3e8732bdf07a130dbf86bc69
parent bfe13dfb

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

+6 −1
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public class MSimSignalClusterView 
            if (showBoth3gAnd1x() || getMobileCdma3gId(strengthIcon) != 0) {

                mMobileCdmaVisible = true;

                mMobileCdma1xOnlyVisible = false;

                mMobileStrengthId[0] = 0;



                mMobileCdma1xId = strengthIcon;

                mMobileCdma3gId = getMobileCdma3gId(mMobileCdma1xId);
@@ -239,8 +240,12 @@ public class MSimSignalClusterView 
                //when it is roaming, just show one icon, rather than two icons for CT.

                mMobileCdmaVisible = false;

                mMobileCdma1xOnlyVisible = true;

                mMobileStrengthId[0] = 0;



                mMobileCdma1xOnlyId = strengthIcon;

            } else {

                mMobileCdmaVisible = false;

                mMobileCdma1xOnlyVisible = false;

            }

        } else {

            mMobileCdmaVisible = false;

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

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ public class SignalClusterView 
            if (showBoth3gAnd1x() || getMobileCdma3gId(strengthIcon) != 0) {

                mMobileCdmaVisible = true;

                mMobileCdma1xOnlyVisible = false;

                mMobileStrengthId = 0;



                mMobileCdma1xId = strengthIcon;

                mMobileCdma3gId = getMobileCdma3gId(mMobileCdma1xId);
@@ -191,8 +192,12 @@ public class SignalClusterView 
                    && (show1xOnly() || isRoaming())) {

                mMobileCdmaVisible = false;

                mMobileCdma1xOnlyVisible = true;

                mMobileStrengthId = 0;



                mMobileCdma1xOnlyId = strengthIcon;

            } else {

                mMobileCdmaVisible = false;

                mMobileCdma1xOnlyVisible = false;

            }

        } else {

            mMobileCdmaVisible = false;