Repair wifi/cellular kerning.

The wifi spacer should only be shown if the first mobile
network has a data type indicator.

Bug: 18665813
Change-Id: Ifcd3a61ebc8cdb76d134baa23b22f1291edadd28
This commit is contained in:
Dan Sandler
2014-12-08 15:00:09 -05:00
parent 8b33cf4d34
commit e912c9cc39

View File

@@ -277,9 +277,13 @@ public class SignalClusterView
mWifiStrengthId)); mWifiStrengthId));
boolean anyMobileVisible = false; boolean anyMobileVisible = false;
int firstMobileTypeId = 0;
for (PhoneState state : mPhoneStates) { for (PhoneState state : mPhoneStates) {
if (state.apply(anyMobileVisible)) { if (state.apply(anyMobileVisible)) {
anyMobileVisible = true; if (!anyMobileVisible) {
firstMobileTypeId = state.mMobileTypeId;
anyMobileVisible = true;
}
} }
} }
@@ -298,7 +302,7 @@ public class SignalClusterView
mWifiAirplaneSpacer.setVisibility(View.GONE); mWifiAirplaneSpacer.setVisibility(View.GONE);
} }
if ((anyMobileVisible || mNoSimsVisible) && mWifiVisible) { if (((anyMobileVisible && firstMobileTypeId != 0) || mNoSimsVisible) && mWifiVisible) {
mWifiSignalSpacer.setVisibility(View.VISIBLE); mWifiSignalSpacer.setVisibility(View.VISIBLE);
} else { } else {
mWifiSignalSpacer.setVisibility(View.GONE); mWifiSignalSpacer.setVisibility(View.GONE);