From 072755ef026f7f757565e682f28fc547bb897b83 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Sun, 16 Jan 2022 16:22:15 +0800 Subject: [PATCH] Refine the plural strings design in Settings - Use MessageFormat instead of getQuantityString(). Bug: 199229953 Test: manual test See b/199229953#comment2 for a screenshot result. Change-Id: I4fc9cecc83f503203ec5dbc1af638036d7026e07 --- .../wifi/tether/WifiTetherPreferenceController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 67f5944cbd6..94bd78a9c09 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -37,6 +37,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils; +import com.android.settingslib.wifi.WifiUtils; import java.util.List; @@ -136,9 +137,9 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController if (mPreference != null && mSoftApState == WifiManager.WIFI_AP_STATE_ENABLED) { // Only show the number of clients when state is on - mPreference.setSummary(mContext.getResources().getQuantityString( - R.plurals.wifi_tether_connected_summary, clients.size(), - clients.size())); + mPreference.setSummary( + WifiUtils.getWifiTetherSummaryForConnectedDevices(mContext, + clients.size())); } } });