From 35b4725975b9779e5db0f17a60d79879c2642437 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Fri, 19 Feb 2021 15:23:41 +0800 Subject: [PATCH] Can't show 5GE at summary The 5GE has HTML tag, so it should do transformation by Html.fromHtml. Bug: 180053606 Test: atest ProviderModelSliceHelperTest.java Change-Id: I32ac255d50c52ce853f686ac22572fa1cb44e9cd --- .../settings/network/ProviderModelSliceHelper.java | 3 ++- .../settings/network/ProviderModelSliceHelperTest.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java index c7a7ad488e4..8ae4197c9fa 100644 --- a/src/com/android/settings/network/ProviderModelSliceHelper.java +++ b/src/com/android/settings/network/ProviderModelSliceHelper.java @@ -29,6 +29,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; @@ -141,7 +142,7 @@ public class ProviderModelSliceHelper { .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE) .addEndItem(toggleAction) .setPrimaryAction(primaryAction) - .setSubtitle(summary); + .setSubtitle(Html.fromHtml(summary, Html.FROM_HTML_MODE_LEGACY)); return rowBuilder; } diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java index 72e9be4a3b3..d205607db23 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java @@ -40,6 +40,7 @@ import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.text.Html; import androidx.slice.Slice; import androidx.slice.builders.GridRowBuilder; @@ -169,7 +170,7 @@ public class ProviderModelSliceHelperTest { @Test public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() { String expectDisplayName = "Name1"; - String expectedSubtitle = "5G"; + CharSequence expectedSubtitle = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY); String networkType = "5G"; final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); @@ -199,8 +200,9 @@ public class ProviderModelSliceHelperTest { String networkType = "5G"; String connectedText = ResourcesUtils.getResourcesString(mContext, "mobile_data_connection_active"); - String expectedSubtitle = ResourcesUtils.getResourcesString(mContext, - "preference_summary_default_combination", connectedText, networkType); + CharSequence expectedSubtitle = Html.fromHtml(ResourcesUtils.getResourcesString(mContext, + "preference_summary_default_combination", connectedText, networkType), + Html.FROM_HTML_MODE_LEGACY); final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);