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

Use ICU style for choose_sim_text to handle special cases in RU

Browse Source 
Bug: 185406678
Test: Build
Change-Id: I43bf77b0b09ae4c2bb8b3acf976d996854a80866
This commit is contained in:
Peter Wang
2021-06-15 18:27:34 -07:00
parent 19baf0df84
commit 3b03d484fb
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -12852,7 +12852,11 @@
<!-- The title text of choose SIM activity. [CHAR LIMIT=NONE] --> <!-- The title text of choose SIM activity. [CHAR LIMIT=NONE] -->
<string name="choose_sim_title">Choose a number to use</string> <string name="choose_sim_title">Choose a number to use</string>
<!-- The body text of choose SIM activity. [CHAR LIMIT=NONE] --> <!-- The body text of choose SIM activity. [CHAR LIMIT=NONE] -->
<string name="choose_sim_text"><xliff:g id="number" example="2">%1$d</xliff:g> numbers are available on this device, but only one can be used at a time</string> <string name="choose_sim_text">{count, plural,
=1 {1 number is available on this device, but only one can be used at a time}
=2 {2 numbers are available on this device, but only one can be used at a time}
other {# numbers are available on this device, but only one can be used at a time}
}</string>
<!-- String indicating that we are activating the profile [CHAR LIMIT=NONE] --> <!-- String indicating that we are activating the profile [CHAR LIMIT=NONE] -->
<string name="choose_sim_activating">Activating<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string> <string name="choose_sim_activating">Activating<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
<!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] --> <!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] -->

11
src/com/android/settings/sim/ChooseSimActivity.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.sim;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.icu.text.MessageFormat;
import android.os.Bundle; import android.os.Bundle;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
@@ -43,7 +44,10 @@ import com.google.android.setupdesign.items.ItemGroup;
import com.google.android.setupdesign.items.RecyclerItemAdapter; import com.google.android.setupdesign.items.RecyclerItemAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map;
/** Activity to show a list of profiles for user to choose. */ /** Activity to show a list of profiles for user to choose. */
public class ChooseSimActivity extends Activity public class ChooseSimActivity extends Activity
@@ -108,7 +112,12 @@ public class ChooseSimActivity extends Activity
subscriptionCount++; subscriptionCount++;
} }
layout.setHeaderText(getString(R.string.choose_sim_title)); layout.setHeaderText(getString(R.string.choose_sim_title));
layout.setDescriptionText(getString(R.string.choose_sim_text, subscriptionCount)); MessageFormat msgFormat = new MessageFormat(
getString(R.string.choose_sim_text),
Locale.getDefault());
Map<String, Object> arguments = new HashMap<>();
arguments.put("count", subscriptionCount);
layout.setDescriptionText(msgFormat.format(arguments));
displaySubscriptions(); displaySubscriptions();