PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Can't show 5GE at summary" into sc-dev am: 851a2f8557

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99741e734cf735048b691c7fb8e38ff846086d4e
This commit is contained in:
SongFerng Wang
2021-02-19 09:54:41 +00:00
committed by Automerger Merge Worker
parent befd6ba551 851a2f8557
commit d296fbbd11
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/ProviderModelSliceHelper.java
View File

@@ -29,6 +29,7 @@ import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -141,7 +142,7 @@ public class ProviderModelSliceHelper {
.setTitleItem(levelIcon, ListBuilder.ICON_IMAGE) .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
.addEndItem(toggleAction) .addEndItem(toggleAction)
.setPrimaryAction(primaryAction) .setPrimaryAction(primaryAction)
.setSubtitle(summary); .setSubtitle(Html.fromHtml(summary, Html.FROM_HTML_MODE_LEGACY));
return rowBuilder; return rowBuilder;
} }

8
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -40,6 +40,7 @@ import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Html;
import androidx.slice.Slice; import androidx.slice.Slice;
import androidx.slice.builders.GridRowBuilder; import androidx.slice.builders.GridRowBuilder;
@@ -169,7 +170,7 @@ public class ProviderModelSliceHelperTest {
@Test @Test
public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() { public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1"; String expectDisplayName = "Name1";
String expectedSubtitle = "5G"; CharSequence expectedSubtitle = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY);
String networkType = "5G"; String networkType = "5G";
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
@@ -199,8 +200,9 @@ public class ProviderModelSliceHelperTest {
String networkType = "5G"; String networkType = "5G";
String connectedText = ResourcesUtils.getResourcesString(mContext, String connectedText = ResourcesUtils.getResourcesString(mContext,
"mobile_data_connection_active"); "mobile_data_connection_active");
String expectedSubtitle = ResourcesUtils.getResourcesString(mContext, CharSequence expectedSubtitle = Html.fromHtml(ResourcesUtils.getResourcesString(mContext,
"preference_summary_default_combination", connectedText, networkType); "preference_summary_default_combination", connectedText, networkType),
Html.FROM_HTML_MODE_LEGACY);
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId); when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);