diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8f9e934c97e53..9da7379b4f04e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -487,6 +487,9 @@ 5Ge + + <i>5G <small>E</small></i> + 5G diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroupController.java b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroupController.java index 86fccd7f9d525..eb5b4cc4c0df9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroupController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroupController.java @@ -69,8 +69,10 @@ public class QSCarrierGroupController { @Override public void setMobileDataIndicators(NetworkController.IconState statusIcon, NetworkController.IconState qsIcon, int statusType, int qsType, - boolean activityIn, boolean activityOut, String typeContentDescription, - String description, boolean isWide, int subId, boolean roaming) { + boolean activityIn, boolean activityOut, + CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml, CharSequence description, + boolean isWide, int subId, boolean roaming) { int slotIndex = getSlotIndex(subId); if (slotIndex >= SIM_SLOTS) { Log.w(TAG, "setMobileDataIndicators - slot: " + slotIndex); @@ -83,7 +85,7 @@ public class QSCarrierGroupController { mInfos[slotIndex].visible = statusIcon.visible; mInfos[slotIndex].mobileSignalIconId = statusIcon.icon; mInfos[slotIndex].contentDescription = statusIcon.contentDescription; - mInfos[slotIndex].typeContentDescription = typeContentDescription; + mInfos[slotIndex].typeContentDescription = typeContentDescription.toString(); mInfos[slotIndex].roaming = roaming; mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index d5f86c9514072..436869d5ef883 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -26,6 +26,7 @@ import android.content.res.Resources; import android.provider.Settings; import android.service.quicksettings.Tile; import android.telephony.SubscriptionManager; +import android.text.Html; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -205,12 +206,13 @@ public class CellularTile extends QSTileImpl { private CharSequence appendMobileDataType(CharSequence current, CharSequence dataType) { if (TextUtils.isEmpty(dataType)) { - return current; + return Html.fromHtml(current.toString(), 0); } if (TextUtils.isEmpty(current)) { - return dataType; + return Html.fromHtml(dataType.toString(), 0); } - return mContext.getString(R.string.mobile_carrier_text_format, current, dataType); + String concat = mContext.getString(R.string.mobile_carrier_text_format, current, dataType); + return Html.fromHtml(concat, 0); } private CharSequence getMobileDataContentName(CallbackInfo cb) { @@ -251,14 +253,17 @@ public class CellularTile extends QSTileImpl { @Override public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, - int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, - String description, boolean isWide, int subId, boolean roaming) { + int qsType, boolean activityIn, boolean activityOut, + CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml, CharSequence description, + boolean isWide, int subId, boolean roaming) { if (qsIcon == null) { // Not data sim, don't display. return; } mInfo.dataSubscriptionName = mController.getMobileDataNetworkName(); - mInfo.dataContentDescription = (description != null) ? typeContentDescription : null; + mInfo.dataContentDescription = + (description != null) ? typeContentDescriptionHtml : null; mInfo.activityIn = activityIn; mInfo.activityOut = activityOut; mInfo.roaming = roaming; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index d2e92629ed787..690d57345db60 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -177,8 +177,10 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba @Override public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, - int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, - String description, boolean isWide, int subId, boolean roaming) { + int qsType, boolean activityIn, boolean activityOut, + CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml, CharSequence description, + boolean isWide, int subId, boolean roaming) { MobileIconState state = getState(subId); if (state == null) { return; @@ -387,7 +389,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba public int typeId; public boolean roaming; public boolean needsLeadingPadding; - public String typeContentDescription; + public CharSequence typeContentDescription; private MobileIconState(int subId) { super(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java index e1bb19a6f69fa..97d348bb6a222 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java @@ -111,30 +111,25 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa public void setWifiIndicators(final boolean enabled, final IconState statusIcon, final IconState qsIcon, final boolean activityIn, final boolean activityOut, final String description, boolean isTransient, String secondaryLabel) { - post(new Runnable() { - @Override - public void run() { - for (SignalCallback callback : mSignalCallbacks) { - callback.setWifiIndicators(enabled, statusIcon, qsIcon, activityIn, activityOut, - description, isTransient, secondaryLabel); - } + post(() -> { + for (SignalCallback callback : mSignalCallbacks) { + callback.setWifiIndicators(enabled, statusIcon, qsIcon, activityIn, activityOut, + description, isTransient, secondaryLabel); } }); } @Override public void setMobileDataIndicators(final IconState statusIcon, final IconState qsIcon, - final int statusType, final int qsType,final boolean activityIn, - final boolean activityOut, final String typeContentDescription, - final String description, final boolean isWide, final int subId, boolean roaming) { - post(new Runnable() { - @Override - public void run() { - for (SignalCallback signalCluster : mSignalCallbacks) { - signalCluster.setMobileDataIndicators(statusIcon, qsIcon, statusType, qsType, - activityIn, activityOut, typeContentDescription, description, isWide, - subId, roaming); - } + final int statusType, final int qsType, final boolean activityIn, + final boolean activityOut, final CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml, final CharSequence description, + final boolean isWide, final int subId, boolean roaming) { + post(() -> { + for (SignalCallback signalCluster : mSignalCallbacks) { + signalCluster.setMobileDataIndicators(statusIcon, qsIcon, statusType, qsType, + activityIn, activityOut, typeContentDescription, + typeContentDescriptionHtml, description, isWide, subId, roaming); } }); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java index 159bd41a20948..4fbf5ff3d35fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java @@ -49,7 +49,7 @@ public class EthernetSignalController extends @Override public void notifyListeners(SignalCallback callback) { boolean ethernetVisible = mCurrentState.connected; - String contentDescription = getStringIfExists(getContentDescription()); + String contentDescription = getTextIfExists(getContentDescription()).toString(); // TODO: wire up data transfer using WifiSignalPoller. callback.setEthernetIndicators(new IconState(ethernetVisible, getCurrentIconId(), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 28ba1257524dc..f6e1681e7b584 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -39,6 +39,7 @@ import android.telephony.SignalStrength; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -114,9 +115,10 @@ public class MobileSignalController extends SignalController< mDefaults = defaults; mSubscriptionInfo = info; mPhoneStateListener = new MobilePhoneStateListener((new Handler(receiverLooper))::post); - mNetworkNameSeparator = getStringIfExists(R.string.status_bar_network_name_separator); - mNetworkNameDefault = getStringIfExists( - com.android.internal.R.string.lockscreen_carrier_default); + mNetworkNameSeparator = getTextIfExists(R.string.status_bar_network_name_separator) + .toString(); + mNetworkNameDefault = getTextIfExists( + com.android.internal.R.string.lockscreen_carrier_default).toString(); mapIconSets(); @@ -153,10 +155,6 @@ public class MobileSignalController extends SignalController< updateTelephony(); } - public int getDataContentDescription() { - return getIcons().mDataContentDescription; - } - public void setAirplaneMode(boolean airplaneMode) { mCurrentState.airplaneMode = airplaneMode; notifyListenersIfNecessary(); @@ -360,8 +358,14 @@ public class MobileSignalController extends SignalController< public void notifyListeners(SignalCallback callback) { MobileIconGroup icons = getIcons(); - String contentDescription = getStringIfExists(getContentDescription()); - String dataContentDescription = getStringIfExists(icons.mDataContentDescription); + String contentDescription = getTextIfExists(getContentDescription()).toString(); + CharSequence dataContentDescriptionHtml = getTextIfExists(icons.mDataContentDescription); + + //TODO: Hacky + // The data content description can sometimes be shown in a text view and might come to us + // as HTML. Strip any styling here so that listeners don't have to care + CharSequence dataContentDescription = Html.fromHtml( + dataContentDescriptionHtml.toString(), 0).toString(); if (mCurrentState.inetCondition == 0) { dataContentDescription = mContext.getString(R.string.data_connection_no_internet); } @@ -376,7 +380,7 @@ public class MobileSignalController extends SignalController< int qsTypeIcon = 0; IconState qsIcon = null; - String description = null; + CharSequence description = null; // Only send data sim callbacks to QS. if (mCurrentState.dataSim) { qsTypeIcon = (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.mQsDataType : 0; @@ -393,8 +397,9 @@ public class MobileSignalController extends SignalController< showDataIcon &= mCurrentState.isDefault || dataDisabled; int typeIcon = (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.mDataType : 0; callback.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon, - activityIn, activityOut, dataContentDescription, description, icons.mIsWide, - mSubscriptionInfo.getSubscriptionId(), mCurrentState.roaming); + activityIn, activityOut, dataContentDescription, dataContentDescriptionHtml, + description, icons.mIsWide, mSubscriptionInfo.getSubscriptionId(), + mCurrentState.roaming); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 71db618d60763..95a97729936b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -44,6 +44,7 @@ public interface NetworkController extends CallbackController, D void addEmergencyListener(EmergencyListener listener); void removeEmergencyListener(EmergencyListener listener); boolean hasEmergencyCryptKeeperText(); + boolean isRadioOn(); public interface SignalCallback { @@ -51,10 +52,31 @@ public interface NetworkController extends CallbackController, D boolean activityIn, boolean activityOut, String description, boolean isTransient, String statusLabel) {} + /** + * Callback for listeners to be able to update the state of any UI tracking connectivity + * @param statusIcon the icon that should be shown in the status bar + * @param qsIcon the icon to show in Quick Settings + * @param statusType the resId of the data type icon (e.g. LTE) to show in the status bar + * @param qsType similar to above, the resId of the data type icon to show in Quick Settings + * @param activityIn indicates whether there is inbound activity + * @param activityOut indicates outbound activity + * @param typeContentDescription the contentDescription of the data type + * @param typeContentDescriptionHtml the (possibly HTML-styled) contentDescription of the + * data type. Suitable for display + * @param description description of the network (usually just the network name) + * @param isWide //TODO: unused? + * @param subId subscription ID for which to update the UI + * @param roaming indicates roaming + */ default void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, - int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, - String description, boolean isWide, int subId, boolean roaming) {} + int qsType, boolean activityIn, boolean activityOut, + CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml, CharSequence description, + boolean isWide, int subId, boolean roaming) { + } + default void setSubs(List subs) {} + default void setNoSims(boolean show, boolean simDetected) {} default void setEthernetIndicators(IconState icon) {} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 46143ca0dd242..4f382e7049cf4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -1016,6 +1016,7 @@ public class NetworkControllerImpl extends BroadcastReceiver datatype.equals("4g") ? TelephonyIcons.FOUR_G : datatype.equals("4g+") ? TelephonyIcons.FOUR_G_PLUS : datatype.equals("5g") ? TelephonyIcons.NR_5G : + datatype.equals("5ge") ? TelephonyIcons.LTE_CA_5G_E : datatype.equals("5g+") ? TelephonyIcons.NR_5G_PLUS : datatype.equals("e") ? TelephonyIcons.E : datatype.equals("g") ? TelephonyIcons.G : diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java index fc6e5e22c2e80..749b56ce28c09 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.policy; import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG; +import android.annotation.NonNull; import android.content.Context; import android.util.Log; @@ -166,8 +167,8 @@ public abstract class SignalController statusArg = ArgumentCaptor.forClass(IconState.class); @@ -132,14 +133,16 @@ public class CallbackHandlerTest extends SysuiTestCase { ArgumentCaptor qsTypeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor inArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor outArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor typeContentArg = ArgumentCaptor.forClass(String.class); - ArgumentCaptor descArg = ArgumentCaptor.forClass(String.class); + ArgumentCaptor typeContentArg = ArgumentCaptor.forClass(CharSequence.class); + ArgumentCaptor typeContentHtmlArg = + ArgumentCaptor.forClass(CharSequence.class); + ArgumentCaptor descArg = ArgumentCaptor.forClass(CharSequence.class); ArgumentCaptor wideArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor subIdArg = ArgumentCaptor.forClass(Integer.class); Mockito.verify(mSignalCallback).setMobileDataIndicators(statusArg.capture(), qsArg.capture(), typeIconArg.capture(), qsTypeIconArg.capture(), inArg.capture(), - outArg.capture(), typeContentArg.capture(), descArg.capture(), wideArg.capture(), - subIdArg.capture(), eq(roaming)); + outArg.capture(), typeContentArg.capture(), typeContentHtmlArg.capture(), + descArg.capture(), wideArg.capture(), subIdArg.capture(), eq(roaming)); assertEquals(status, statusArg.getValue()); assertEquals(qs, qsArg.getValue()); assertEquals(type, (int) typeIconArg.getValue()); @@ -147,6 +150,7 @@ public class CallbackHandlerTest extends SysuiTestCase { assertEquals(in, (boolean) inArg.getValue()); assertEquals(out, (boolean) outArg.getValue()); assertEquals(typeDescription, typeContentArg.getValue()); + assertEquals(typeDescriptionHtml, typeContentHtmlArg.getValue()); assertEquals(description, descArg.getValue()); assertEquals(wide, (boolean) wideArg.getValue()); assertEquals(subId, (int) subIdArg.getValue()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 294d546e087b9..9a0e97aad9c2e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -413,7 +413,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase { iconArg.capture(), anyInt(), typeIconArg.capture(), dataInArg.capture(), dataOutArg.capture(), - anyString(), anyString(), anyBoolean(), anyInt(), anyBoolean()); + any(CharSequence.class), any(CharSequence.class), any(CharSequence.class), + anyBoolean(), anyInt(), anyBoolean()); IconState iconState = iconArg.getValue(); int state = SignalDrawable.getState(icon, CellSignalStrength.getNumSignalStrengthLevels(), false); @@ -445,8 +446,9 @@ public class NetworkControllerBaseTest extends SysuiTestCase { iconArg.capture(), any(), typeIconArg.capture(), - anyInt(), anyBoolean(), anyBoolean(), anyString(), anyString(), anyBoolean(), - anyInt(), eq(roaming)); + anyInt(), anyBoolean(), anyBoolean(), + any(CharSequence.class), any(CharSequence.class), any(CharSequence.class), + anyBoolean(), anyInt(), eq(roaming)); IconState iconState = iconArg.getValue(); int state = icon == -1 ? 0 @@ -468,19 +470,23 @@ public class NetworkControllerBaseTest extends SysuiTestCase { boolean cutOut) { verifyLastMobileDataIndicators( visible, icon, typeIcon, qsVisible, qsIcon, qsTypeIcon, dataIn, dataOut, cutOut, - null); + null, null); } protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon, boolean qsVisible, int qsIcon, int qsTypeIcon, boolean dataIn, boolean dataOut, - boolean cutOut, String typeContentDescription) { + boolean cutOut, CharSequence typeContentDescription, + CharSequence typeContentDescriptionHtml) { ArgumentCaptor iconArg = ArgumentCaptor.forClass(IconState.class); ArgumentCaptor typeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor qsIconArg = ArgumentCaptor.forClass(IconState.class); ArgumentCaptor qsTypeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor dataInArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor dataOutArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor typeContentDescriptionArg = ArgumentCaptor.forClass(String.class); + ArgumentCaptor typeContentDescriptionArg = + ArgumentCaptor.forClass(CharSequence.class); + ArgumentCaptor typeContentDescriptionHtmlArg = + ArgumentCaptor.forClass(CharSequence.class); Mockito.verify(mCallbackHandler, Mockito.atLeastOnce()).setMobileDataIndicators( iconArg.capture(), @@ -490,6 +496,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { dataInArg.capture(), dataOutArg.capture(), typeContentDescriptionArg.capture(), + typeContentDescriptionHtmlArg.capture(), anyString(), anyBoolean(), anyInt(), anyBoolean()); IconState iconState = iconArg.getValue(); @@ -516,6 +523,10 @@ public class NetworkControllerBaseTest extends SysuiTestCase { assertEquals("Type content description", typeContentDescription, typeContentDescriptionArg.getValue()); } + if (typeContentDescriptionHtml != null) { // Only check if it was provided + assertEquals("Type content description (html)", typeContentDescriptionHtml, + typeContentDescriptionHtmlArg.getValue()); + } } protected void assertNetworkNameEquals(String expected) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index 1eb59396e525f..a906d9fa12bda 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -132,7 +132,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, true, NO_DATA_STRING); + false, true, NO_DATA_STRING, NO_DATA_STRING); } @Test @@ -146,7 +146,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, true, NO_DATA_STRING); + false, true, NO_DATA_STRING, NO_DATA_STRING); } @Test @@ -161,7 +161,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, false, NOT_DEFAULT_DATA_STRING); + false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING); } @Test @@ -176,7 +176,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, false, NOT_DEFAULT_DATA_STRING); + false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index f52c8c17bfa54..b922f0600427e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -369,8 +369,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { mNetworkController.onReceive(mContext, intent); String defaultNetworkName = mMobileSignalController - .getStringIfExists( - com.android.internal.R.string.lockscreen_carrier_default); + .getTextIfExists( + com.android.internal.R.string.lockscreen_carrier_default).toString(); assertNetworkNameEquals(defaultNetworkName); } @@ -383,8 +383,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { mNetworkController.onReceive(mContext, intent); - String defaultNetworkName = mMobileSignalController.getStringIfExists( - com.android.internal.R.string.lockscreen_carrier_default); + String defaultNetworkName = mMobileSignalController.getTextIfExists( + com.android.internal.R.string.lockscreen_carrier_default).toString(); assertNetworkNameEquals(defaultNetworkName); } @@ -401,8 +401,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { mNetworkController.onReceive(mContext, intent); assertNetworkNameEquals(plmn - + mMobileSignalController.getStringIfExists( - R.string.status_bar_network_name_separator) + + mMobileSignalController.getTextIfExists( + R.string.status_bar_network_name_separator).toString() + spn); }