From 8b95b7a6e9c9a14adba9c0eb731814acd529f761 Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Fri, 21 May 2021 11:07:07 +0800 Subject: [PATCH] Update subtext for "Network & internet" Remove "and" to align with the other menu items. Fixes: 183642373 Test: robotests & visual Change-Id: I4d48b9c5a867d7afa04b7c3f0d6495b455df6621 --- ...opLevelNetworkEntryPreferenceController.java | 17 +++++++++++++++-- ...velNetworkEntryPreferenceControllerTest.java | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java index c630cc78507..f0eb96d7958 100644 --- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.network; import android.content.Context; -import android.icu.text.ListFormatter; import android.text.BidiFormatter; import android.text.TextUtils; @@ -75,6 +74,20 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont && !TextUtils.isEmpty(hotspotSummary)) { summaries.add(hotspotSummary); } - return ListFormatter.getInstance().format(summaries); + return concatSummaries(summaries); + } + + private CharSequence concatSummaries(List summaries) { + if (summaries.isEmpty()) { + return mContext.getText(R.string.summary_placeholder); + } + + String summary = summaries.get(0); + final int summary_size = summaries.size(); + for (int i = 1; i < summary_size; i++) { + summary = mContext.getString(R.string.join_two_unrelated_items, summary, + summaries.get(i)); + } + return summary; } } diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index a3f0c90c1a2..81092eba162 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -92,7 +92,7 @@ public class TopLevelNetworkEntryPreferenceControllerTest { when(mTetherPreferenceController.isAvailable()).thenReturn(true); assertThat(mController.getSummary()) - .isEqualTo("Wi\u2011Fi, mobile, data usage, and hotspot"); + .isEqualTo("Wi\u2011Fi, mobile, data usage, hotspot"); } @Test @@ -101,6 +101,6 @@ public class TopLevelNetworkEntryPreferenceControllerTest { when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false); when(mTetherPreferenceController.isAvailable()).thenReturn(false); - assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage"); + assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi, data usage"); } }