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

Commit 6a7158ba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SystemUI: Fix icon display abnormal when dds switch between SIMs"

parents 14b7109d c8dfd205

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 


<com.android.systemui.statusbar.MSimSignalClusterView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    >

    <FrameLayout

        android:id="@+id/wifi_combo"

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

+19 −18
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ public class MSimSignalClusterView 
            mDataActivityId[subscription] = activityIcon;

            mDataVisible[subscription] = (activityIcon != 0) ? true : false;

        }



        if (mStyle == STATUS_BAR_STYLE_CDMA_1X_COMBINED) {

            if (subscription == MSimConstants.DEFAULT_SUBSCRIPTION) {

                if (showBoth3gAnd1x() || getMobileCdma3gId(strengthIcon) != 0) {

                    mMobileCdmaVisible = true;

                    mMobileCdma1xOnlyVisible = false;
@@ -285,6 +285,7 @@ public class MSimSignalClusterView 
                    mMobileCdmaVisible = false;

                    mMobileCdma1xOnlyVisible = false;

                }

            }

        } else if (mStyle == STATUS_BAR_STYLE_DATA_VOICE) {

            if (showBothDataAndVoice(subscription)

                    || getMobileVoiceId(strengthIcon) != 0) {