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

Commit ee2c2066 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Add padding when both data icon and wifi icon is visible 

Bug: 18026628
Change-Id: I9fe56b53d5d2fbd5e8ea8812b56a1ce5a8c7a5d3
parent df385fff

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

+3 −6
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public class SignalClusterView 
    private boolean mIsAirplaneMode = false;

    private int mAirplaneIconId = 0;

    private String mWifiDescription, mMobileDescription, mMobileTypeDescription;

    private boolean mRoaming;

    private boolean mIsMobileTypeIconWide;



    ViewGroup mWifiGroup, mMobileGroup;
@@ -143,14 +142,12 @@ public class SignalClusterView 


    @Override

    public void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon,

            String contentDescription, String typeContentDescription, boolean roaming,

            boolean isTypeIconWide) {

            String contentDescription, String typeContentDescription, boolean isTypeIconWide) {

        mMobileVisible = visible;

        mMobileStrengthId = strengthIcon;

        mMobileTypeId = typeIcon;

        mMobileDescription = contentDescription;

        mMobileTypeDescription = typeContentDescription;

        mRoaming = roaming;

        mIsMobileTypeIconWide = isTypeIconWide;



        apply();
@@ -244,7 +241,7 @@ public class SignalClusterView 
            mWifiAirplaneSpacer.setVisibility(View.GONE);

        }



        if (mRoaming && mMobileVisible && mWifiVisible) {

        if (mMobileVisible && mMobileTypeId != 0 && mWifiVisible) {

            mWifiSignalSpacer.setVisibility(View.VISIBLE);

        } else {

            mWifiSignalSpacer.setVisibility(View.GONE);
@@ -257,7 +254,7 @@ public class SignalClusterView 
                    (mMobileVisible ? "VISIBLE" : "GONE"),

                    mMobileStrengthId, mMobileTypeId));



        mMobileType.setVisibility((mRoaming || mMobileTypeId != 0) ? View.VISIBLE : View.GONE);

        mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+1 −5
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    public interface SignalCluster {

        void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription);

        void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon,

                String contentDescription, String typeContentDescription, boolean roaming,

                boolean isTypeIconWide);

                String contentDescription, String typeContentDescription, boolean isTypeIconWide);

        void setIsAirplaneMode(boolean is, int airplaneIcon);

    }
@@ -386,7 +385,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                    mDataTypeIconId,

                    mContentDescriptionWimax,

                    mContentDescriptionDataType,

                    mDataTypeIconId == TelephonyIcons.ROAMING_ICON,

                    false /* isTypeIconWide */ );

        } else {

            // normal mobile data
@@ -396,7 +394,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                    mDataTypeIconId,

                    mContentDescriptionPhoneSignal,

                    mContentDescriptionDataType,

                    mDataTypeIconId == TelephonyIcons.ROAMING_ICON,

                    isTypeIconWide(mDataTypeIconId));

        }

        cluster.setIsAirplaneMode(mAirplaneMode, mAirplaneIconId);
@@ -1606,7 +1603,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                            mDemoDataTypeIconId,

                            "Demo",

                            "Demo",

                            mDemoDataTypeIconId == TelephonyIcons.ROAMING_ICON,

                            isTypeIconWide(mDemoDataTypeIconId));

                }

                refreshViews();