Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab4011a..9a88e98 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1476,8 +1476,7 @@
<activity
android:name="Settings$TextToSpeechSettingsActivity"
- android:label="@string/tts_settings"
- android:parentActivityName="Settings">
+ android:label="@string/tts_settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.TTS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-nodpi/accessibility_timeout b/res/drawable-nodpi/accessibility_timeout
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/drawable-nodpi/accessibility_timeout
diff --git a/res/raw/accessibility_timeout.mp4 b/res/raw/accessibility_timeout.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/accessibility_timeout.mp4
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3473fe6..808d728 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1097,20 +1097,12 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Swerfvoorkeur"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobiel"</item>
<item msgid="2838022395783120596">"Net Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobiel"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9e39e5f..54ba5ab 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1098,20 +1098,12 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ውጫዊ አገልግሎት ምርጫ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"ተንቀሳቃሽ ስልክ"</item>
<item msgid="2838022395783120596">"Wi-Fi ብቻ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"ተንቀሳቃሽ ስልክ"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 72e17cc..31404f0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1169,20 +1169,12 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"تفضيل التجوال"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"الجوّال"</item>
<item msgid="2838022395783120596">"Wi-Fi فقط"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"الجوّال"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index d33232b..2332a4c 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1096,20 +1096,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ৰ\'মিঙৰ অগ্ৰাধিকাৰ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"ৱাই-ফাই"</item>
<item msgid="7715869266611010880">"ম’বাইল"</item>
<item msgid="2838022395783120596">"ৱাই-ফাই মাত্ৰ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"ৱাই-ফাই"</item>
<item msgid="1118703915148755405">"ম’বাইল"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e760a83..6967a57 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaminq seçimi"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Yalnız Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index df2223d..11c49a6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Podešavanja rominga"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobilni podaci"</item>
<item msgid="2838022395783120596">"Samo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobilni podaci"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 104fe3e..1d5230e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Налады роўмінгу"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мабільны інтэрнэт"</item>
<item msgid="2838022395783120596">"Толькі Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мабільны інтэрнэт"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9f6fb7c..e0af226 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Предпочитание при роуминг"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобилни данни"</item>
<item msgid="2838022395783120596">"Само Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобилни данни"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f58fdb2..e76878c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"পছন্দের রোমিং"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"ওয়াই-ফাই"</item>
<item msgid="7715869266611010880">"মোবাইল"</item>
<item msgid="2838022395783120596">"শুধুমাত্র ওয়াই-ফাই"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"ওয়াই-ফাই"</item>
<item msgid="1118703915148755405">"মোবাইল"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 2f92a60..489c6ef 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Postavke rominga"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"WiFi"</item>
<item msgid="7715869266611010880">"Mobilna mreža"</item>
<item msgid="2838022395783120596">"Samo WiFi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"WiFi"</item>
<item msgid="1118703915148755405">"Mobilna mreža"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 003d355..c97e1b3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferència en itinerància"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Dades mòbils"</item>
<item msgid="2838022395783120596">"Només Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Dades mòbils"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4d6f832..13a08c1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Předvolba pro roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobilní"</item>
<item msgid="2838022395783120596">"Pouze Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobilní"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5c996a9..927eed2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Præferencer for roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Kun Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d08ae17..5da47d8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming-Präferenz"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"WLAN"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Nur WLAN"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"WLAN"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b86613f..4b02fb0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Προτίμηση περιαγωγής"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Δίκτυο κινητής τηλεφωνίας"</item>
<item msgid="2838022395783120596">"Μόνο Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Δίκτυο κινητής τηλεφωνίας"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 355700e..e0be4f7 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi only"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6cc22af..a61e05a 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi only"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 355700e..e0be4f7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi only"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 355700e..e0be4f7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi only"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index d5fe339..653caab 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1096,20 +1096,11 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi only"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bfeef42..5ceae78 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de la itinerancia"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Móvil"</item>
<item msgid="2838022395783120596">"Solo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Móvil"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4b9a325..5236eb2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Móvil"</item>
<item msgid="2838022395783120596">"Solo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Móvil"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 918a5a1..d9390aa 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Rändluse eelistus"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"WiFi"</item>
<item msgid="7715869266611010880">"Mobiilne andmeside"</item>
<item msgid="2838022395783120596">"Ainult WiFi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"WiFi"</item>
<item msgid="1118703915148755405">"Mobiilne andmeside"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6c6fa3f..2f5b752 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Ibiltaritzako hobespena"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wifia"</item>
<item msgid="7715869266611010880">"Datu-konexioa"</item>
<item msgid="2838022395783120596">"Wi-Fi sarea soilik"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wifia"</item>
<item msgid="1118703915148755405">"Datu-konexioa"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 61a2e0c..a2f6d6d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"تنظیم برگزیده فراگردی"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"داده شبکه تلفن همراه"</item>
<item msgid="2838022395783120596">"فقط Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"داده شبکه تلفن همراه"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0ed052c..a474aa9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming-asetus"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobiili"</item>
<item msgid="2838022395783120596">"Vain Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobiili"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f741c07..7f3985e 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Préférences d\'itinérance"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Cellulaire"</item>
<item msgid="2838022395783120596">"Wi-Fi seulement"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Cellulaire"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 56a5a9c..dc5eeaf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Préférences en matière d\'itinérance"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi uniquement"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 9a83006..1757581 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wifi"</item>
<item msgid="7715869266611010880">"Datos móbiles"</item>
<item msgid="2838022395783120596">"Só por wifi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wifi"</item>
<item msgid="1118703915148755405">"Datos móbiles"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d981a85..b221acf 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"રોમિંગ પસંદગી"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"વાઇ-ફાઇ"</item>
<item msgid="7715869266611010880">"મોબાઇલ"</item>
<item msgid="2838022395783120596">"ફક્ત વાઇ-ફાઇ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"વાઇ-ફાઇ"</item>
<item msgid="1118703915148755405">"મોબાઇલ"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7889ca0..37f54f6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"रोमिंग की प्राथमिकताएं"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"वाई-फ़ाई"</item>
<item msgid="7715869266611010880">"मोबाइल"</item>
<item msgid="2838022395783120596">"केवल वाई-फ़ाई"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"वाई-फ़ाई"</item>
<item msgid="1118703915148755405">"मोबाइल"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e485057..fa5ddf0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Željena postavka za roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobilni uređaj"</item>
<item msgid="2838022395783120596">"Samo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobilni uređaj"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e8e791f..4adbacb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Barangolási beállítás"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Csak Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 140357b..b67f4ad 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Ռոումինգի կարգավորումներ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Բջջային"</item>
<item msgid="2838022395783120596">"Միայն Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Բջջային"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bb3eed7..f44ba29 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferensi roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Ponsel"</item>
<item msgid="2838022395783120596">"Khusus Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Ponsel"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index f316da7..93c5951 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Stillingar fyrir reiki"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Farsímakerfi"</item>
<item msgid="2838022395783120596">"Wi-Fi eingöngu"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Farsímakerfi"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f0cdfea..ec807ac 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferenze durante il roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Rete mobile"</item>
<item msgid="2838022395783120596">"Solo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Rete mobile"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ccec6dd..9650b60 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1133,20 +1133,11 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"אפשרות נדידה מועדפת"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"סלולרי"</item>
<item msgid="2838022395783120596">"Wi-Fi בלבד"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"סלולרי"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index aa8ad9e..e639600 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ローミング設定"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"モバイル"</item>
<item msgid="2838022395783120596">"Wi-Fi のみ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"モバイル"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 988d950..c91d24e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"როუმინგის პარამეტრი"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"მობილური"</item>
<item msgid="2838022395783120596">"მხოლოდ Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"მობილური"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index b2d4f29..baf65ff 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Роуминг параметрі"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобильдік"</item>
<item msgid="2838022395783120596">"Тек Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобильдік"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9172dbd..da7b0fe 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ចំណូលចិត្តរ៉ូមីង"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"ទូរសព្ទចល័ត"</item>
<item msgid="2838022395783120596">"Wi-Fi តែប៉ុណ្ណោះ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"ទូរសព្ទចល័ត"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 74466cf..fce3ed6 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ರೋಮಿಂಗ್ ಪ್ರಾಶಸ್ತ್ಯ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"ವೈ-ಫೈ"</item>
<item msgid="7715869266611010880">"ಮೊಬೈಲ್"</item>
<item msgid="2838022395783120596">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"ವೈ-ಫೈ"</item>
<item msgid="1118703915148755405">"ಮೊಬೈಲ್"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a990afa..050947f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"로밍 환경설정"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"모바일"</item>
<item msgid="2838022395783120596">"Wi-Fi에서만"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"모바일"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6c380b3..e41c7e7 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1096,20 +1096,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Роуминг жөндөөлөрү"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi‑Fi"</item>
<item msgid="7715869266611010880">"Мобилдик түзмөк"</item>
<item msgid="2838022395783120596">"Wi-Fi гана"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi‑Fi"</item>
<item msgid="1118703915148755405">"Мобилдик түзмөк"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 009e616..679ec8a 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ການຕັ້ງຄ່າໂຣມມິງ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"ມືຖື"</item>
<item msgid="2838022395783120596">"Wi-Fi ເທົ່ານັ້ນ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"ມືຖື"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b039635..57ebdc4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Tarptinklinio ryšio nuostata"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"„Wi-Fi“ ryšys"</item>
<item msgid="7715869266611010880">"Mobiliojo ryšio tinklas"</item>
<item msgid="2838022395783120596">"Tik „Wi-Fi“ ryšys"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"„Wi-Fi“ ryšys"</item>
<item msgid="1118703915148755405">"Mobiliojo ryšio tinklas"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index becb0d1..f56d2af 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Viesabonēšanas preference"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobilie dati"</item>
<item msgid="2838022395783120596">"Tikai Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobilie dati"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 9335197..003fd62 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Поставки за роаминг"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобилен интернет"</item>
<item msgid="2838022395783120596">"Само Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобилен интернет"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a2e7b68..7ebbfa8 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"റോമിംഗ് മുൻഗണന"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"വൈ-ഫൈ"</item>
<item msgid="7715869266611010880">"മൊബൈൽ"</item>
<item msgid="2838022395783120596">"വൈ-ഫൈ മാത്രം"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"വൈ-ഫൈ"</item>
<item msgid="1118703915148755405">"മൊബൈൽ"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 519998a..1734543 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Роуминг тохиргоо"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобайл"</item>
<item msgid="2838022395783120596">"Зөвхөн Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобайл"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 41a0d80..a2ededb 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"रोमिंग प्राधान्य"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"वाय-फाय"</item>
<item msgid="7715869266611010880">"मोबाइल"</item>
<item msgid="2838022395783120596">"केवळ वाय-फाय"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"वाय-फाय"</item>
<item msgid="1118703915148755405">"मोबाइल"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2f3bbee..acb57c2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Pilihan perayauan"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mudah alih"</item>
<item msgid="2838022395783120596">"Wi-Fi sahaja"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mudah alih"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 7d663dd..8d3ed52 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"အခြားကွန်ရက်ဝင်သုံးမှုဆိုင်ရာရွေးချယ်မှုများ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"မိုဘိုင်း"</item>
<item msgid="2838022395783120596">"Wi-Fi သာလျှင်"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"မိုဘိုင်း"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f8c7d94..d881fe7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming-innstilling"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Bare Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index a23ce06..12088bb 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"रोमिङ सम्बन्धी प्राथमिकता"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"मोबाइल"</item>
<item msgid="2838022395783120596">"Wi-Fi मात्र"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"मोबाइल"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a85da56..a05f650 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roamingvoorkeur"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wifi"</item>
<item msgid="7715869266611010880">"Mobiel"</item>
<item msgid="2838022395783120596">"Alleen wifi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wifi"</item>
<item msgid="1118703915148755405">"Mobiel"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7af1953..41c79ca 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1096,20 +1096,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ରୋମିଙ୍ଗ ପସନ୍ଦ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"ମୋବାଇଲ୍"</item>
<item msgid="2838022395783120596">"କେବଳ ୱାଇ-ଫାଇ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"ୱାଇ-ଫାଇ"</item>
<item msgid="1118703915148755405">"ମୋବାଇଲ୍"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index e436e65..5979153 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"ਵਾਈ-ਫਾਈ"</item>
<item msgid="7715869266611010880">"ਮੋਬਾਈਲ"</item>
<item msgid="2838022395783120596">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"ਵਾਈ-ਫਾਈ"</item>
<item msgid="1118703915148755405">"ਮੋਬਾਈਲ"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d12ad52..a43ba9a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencje dotyczące roamingu"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Komórkowe"</item>
<item msgid="2838022395783120596">"Tylko Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Komórkowe"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0270907..bd4302e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferências de roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Celular"</item>
<item msgid="2838022395783120596">"Somente Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Celular"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a31c36e..44d7020 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferência de roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Rede móvel"</item>
<item msgid="2838022395783120596">"Apenas Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Rede móvel"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0270907..bd4302e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferências de roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Celular"</item>
<item msgid="2838022395783120596">"Somente Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Celular"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5293de2..bc4f3fb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferințe privind roamingul"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Date mobile"</item>
<item msgid="2838022395783120596">"Numai Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Date mobile"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 824d5d2..65e22ce 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Настройки роуминга"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобильный Интернет"</item>
<item msgid="2838022395783120596">"Только Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобильный Интернет"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index cf98ac4..ea091eb 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"රෝමිං මනාප"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"ජංගම"</item>
<item msgid="2838022395783120596">"Wi-Fi පමණයි"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"ජංගම"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d66418e..48812e8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Predvoľby roamingu"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi‑Fi"</item>
<item msgid="7715869266611010880">"Mobilné dáta"</item>
<item msgid="2838022395783120596">"Len Wi‑Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi‑Fi"</item>
<item msgid="1118703915148755405">"Mobilné dáta"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68b8cad..4dd61a6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Prednostna izbira za gostovanje"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobilno"</item>
<item msgid="2838022395783120596">"Samo Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobilno"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b71afbf..8b23166 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferenca e roaming-ut"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Celular"</item>
<item msgid="2838022395783120596">"Vetëm Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Celular"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5574fb1..53314ee 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1115,20 +1115,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Подешавања роминга"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобилни подаци"</item>
<item msgid="2838022395783120596">"Само Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобилни подаци"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7af351b..39980de 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Inställning för roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil enhet"</item>
<item msgid="2838022395783120596">"Endast Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil enhet"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8f4c94f..7d176ec 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Mapendeleo ya mitandao ya ng\'ambo"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mtandao wa simu"</item>
<item msgid="2838022395783120596">"Wi-Fi pekee"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mtandao wa simu"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 890fa89..ef6e7a2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1098,20 +1098,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ரோமிங் விருப்பத்தேர்வு"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"வைஃபை"</item>
<item msgid="7715869266611010880">"மொபைல்"</item>
<item msgid="2838022395783120596">"வைஃபை மட்டும்"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"வைஃபை"</item>
<item msgid="1118703915148755405">"மொபைல்"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 41c9b52..29d02da 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"రోమింగ్ ప్రాధాన్యత"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"మొబైల్"</item>
<item msgid="2838022395783120596">"Wi-Fi మాత్రమే"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"మొబైల్"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2ddef3c..1268cb1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ค่ากำหนดโรมมิ่ง"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"อินเทอร์เน็ตมือถือ"</item>
<item msgid="2838022395783120596">"Wi-Fi เท่านั้น"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"อินเทอร์เน็ตมือถือ"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 137e8c9..44252be 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Kagustuhan sa roaming"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobile"</item>
<item msgid="2838022395783120596">"Wi-Fi lang"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobile"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c3290c5..1050c71 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Dolaşım tercihi"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Kablosuz"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Yalnızca kablosuz"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Kablosuz"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 48d6910..df3f6ac 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1133,20 +1133,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Параметри роумінгу"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Мобільні"</item>
<item msgid="2838022395783120596">"Лише Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Мобільні"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 242bba3..3549d9c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1097,20 +1097,11 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"رومنگ کی ترجیح"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"موبائل"</item>
<item msgid="2838022395783120596">"صرف Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"موبائل"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f4cdee0..98b8e0a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Rouming sozlamalari"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Mobil"</item>
<item msgid="2838022395783120596">"Faqat Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Mobil"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 865d907..f37e115 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Tùy chọn chuyển vùng"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"Di động"</item>
<item msgid="2838022395783120596">"Chỉ Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"Di động"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cf21151..4eabdae 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"漫游偏好设置"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"WLAN"</item>
<item msgid="7715869266611010880">"移动数据"</item>
<item msgid="2838022395783120596">"仅限 WLAN"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"WLAN"</item>
<item msgid="1118703915148755405">"移动数据"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f31928d..dc79f8a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"漫遊偏好設定"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"流動網絡"</item>
<item msgid="2838022395783120596">"只限 Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"流動網絡"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8d60ba7..467a401 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"漫遊偏好設定"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
<item msgid="7715869266611010880">"行動網路"</item>
<item msgid="2838022395783120596">"僅限 Wi-Fi"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
<item msgid="1118703915148755405">"行動網路"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8230c81..dc1bba0 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1097,20 +1097,13 @@
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Okuncamelayo kokuzulazula"</string>
- <string-array name="wifi_calling_mode_choices">
- <item msgid="772621647207148279">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="2226422868199612072">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- <item msgid="7041954411163832397">"@*android:string/wfc_mode_wifi_only_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"I-Wi-Fi"</item>
<item msgid="7715869266611010880">"Iselula"</item>
<item msgid="2838022395783120596">"I-Wi-Fi kuphela"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="4430473354160964286">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
- <item msgid="5965810717958113109">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
- </string-array>
+
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"I-Wi-Fi"</item>
<item msgid="1118703915148755405">"Iselula"</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 959a72f..5609006 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -842,8 +842,8 @@
<string name="location_settings_summary_location_off">Off</string>
<!-- Summary for Location settings when location is on, explaining how many apps have location permission [CHAR LIMIT=NONE]-->
<plurals name="location_settings_summary_location_on">
- <item quantity="one">On - <xliff:g id="count">%1$d</xliff:g> app can access location</item>
- <item quantity="other">On - <xliff:g id="count">%1$d</xliff:g> apps can access location</item>
+ <item quantity="one">On - <xliff:g id="count">%1$d</xliff:g> app has access to location</item>
+ <item quantity="other">On - <xliff:g id="count">%1$d</xliff:g> apps have access to location</item>
</plurals>
<!-- Location settings, loading the number of apps which have location permission [CHAR LIMIT=30] -->
<string name="location_settings_loading_app_permission_stats">Loading\u2026</string>
@@ -2558,7 +2558,7 @@
<string name="wifi_calling_roaming_mode_summary"><xliff:g id="wfc_roaming_preference" example="Wi-Fi">%1$s</xliff:g></string>
<!-- WFC mode dialog [CHAR LIMIT=45] -->
<string name="wifi_calling_roaming_mode_dialog_title">Roaming preference</string>
- <string-array name="wifi_calling_mode_choices">
+ <string-array name="wifi_calling_mode_choices" translatable="false">
<item>@*android:string/wfc_mode_wifi_preferred_summary</item>
<item>@*android:string/wfc_mode_cellular_preferred_summary</item>
<item>@*android:string/wfc_mode_wifi_only_summary</item>
@@ -2573,7 +2573,7 @@
<item>"1"</item>
<item>"0"</item>
</string-array>
- <string-array name="wifi_calling_mode_choices_without_wifi_only">
+ <string-array name="wifi_calling_mode_choices_without_wifi_only" translatable="false">
<item>@*android:string/wfc_mode_wifi_preferred_summary</item>
<item>@*android:string/wfc_mode_cellular_preferred_summary</item>
</string-array>
@@ -3838,29 +3838,25 @@
<!-- Summary for app permission on Location settings page when location is off [CHAR LIMIT=NONE] -->
<string name="location_app_permission_summary_location_off">Location is off</string>
<!--
- Summary for Location settings when location is on, explaining how many apps have unlimited
- location permission.
-
- "Unlimited access" means the app can access the device location even when it's not being used
- (on background), while "limited" means the app can only access the device location when the user
- is using it (foreground only).
+ Summary for Location settings when location is on, explaining how many apps have location
+ permission.
Please note that the distinction between singular and plural of this sentence only depends on
- the quantity of "background_location_app_count" ("has" vs "have"). The quantity of
+ the quantity of "permitted_location_app_count" ("has" vs "have"). The quantity of
"total_location_app_count" is almost always greater than 1, so "apps" is always in plural form.
[CHAR LIMIT=NONE]-->
<plurals name="location_app_permission_summary_location_on">
<item quantity="one">
- <xliff:g id="background_location_app_count">%1$d</xliff:g>
+ <xliff:g id="permitted_location_app_count">%1$d</xliff:g>
of
<xliff:g id="total_location_app_count">%2$d</xliff:g>
- apps has unlimited access</item>
+ apps has access to location</item>
<item quantity="other">
- <xliff:g id="background_location_app_count">%1$d</xliff:g>
+ <xliff:g id="permitted_location_app_count">%1$d</xliff:g>
of
<xliff:g id="total_location_app_count">%2$d</xliff:g>
- apps have unlimited access</item>
+ apps have access to location</item>
</plurals>
<!-- [CHAR LIMIT=50] Location settings screen, sub category for recent location access -->
<string name="location_category_recent_location_access">Recent location access</string>
diff --git a/res/xml/accessibility_content_timeout_settings.xml b/res/xml/accessibility_content_timeout_settings.xml
index 2d9072b..ea8d88a 100644
--- a/res/xml/accessibility_content_timeout_settings.xml
+++ b/res/xml/accessibility_content_timeout_settings.xml
@@ -25,8 +25,8 @@
<com.android.settings.widget.VideoPreference
android:key="accessibility_content_timeout_video"
android:title="@string/summary_placeholder"
- settings:animation="@raw/gesture_swipe_up"
- settings:preview="@drawable/gesture_swipe_up"
+ settings:animation="@raw/accessibility_timeout"
+ settings:preview="@drawable/accessibility_timeout"
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml
index ea8d8c6..e5a6e5b 100644
--- a/res/xml/accessibility_control_timeout_settings.xml
+++ b/res/xml/accessibility_control_timeout_settings.xml
@@ -25,8 +25,8 @@
<com.android.settings.widget.VideoPreference
android:key="accessibility_control_timeout_video"
android:title="@string/summary_placeholder"
- settings:animation="@raw/gesture_swipe_up"
- settings:preview="@drawable/gesture_swipe_up"
+ settings:animation="@raw/accessibility_timeout"
+ settings:preview="@drawable/accessibility_timeout"
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
diff --git a/res/xml/data_usage_cellular.xml b/res/xml/data_usage_cellular.xml
index b50eaba..fe1a072 100644
--- a/res/xml/data_usage_cellular.xml
+++ b/res/xml/data_usage_cellular.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="data_usage_cellular_screen">
<com.android.settings.datausage.TemplatePreferenceCategory
@@ -24,7 +25,8 @@
<com.android.settings.datausage.CellDataPreference
android:key="data_usage_enable"
- android:title="@string/data_usage_enable_mobile" />
+ android:title="@string/data_usage_enable_mobile"
+ settings:searchable="false" />
<com.android.settings.datausage.DataUsagePreference
android:key="cellular_data_usage"
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 78391f2..85a0879 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -19,6 +19,7 @@
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
import android.app.settings.SettingsEnums;
+import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
@@ -107,7 +108,8 @@
BatteryTipPreferenceController mBatteryTipPreferenceController;
private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
- private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
+ @VisibleForTesting
+ final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
@Override
public void onChange(boolean selfChange, Uri uri) {
restartBatteryInfoLoader();
@@ -202,21 +204,6 @@
};
@Override
- public void onStop() {
- getContentResolver().unregisterContentObserver(mSettingsObserver);
- super.onStop();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- getContentResolver().registerContentObserver(
- Global.getUriFor(Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
- false,
- mSettingsObserver);
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
final SettingsActivity activity = (SettingsActivity) getActivity();
@@ -252,6 +239,21 @@
}
@Override
+ public void onResume() {
+ super.onResume();
+ getContentResolver().registerContentObserver(
+ Global.getUriFor(Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
+ false,
+ mSettingsObserver);
+ }
+
+ @Override
+ public void onPause() {
+ getContentResolver().unregisterContentObserver(mSettingsObserver);
+ super.onPause();
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.FUELGAUGE_POWER_USAGE_SUMMARY_V2;
}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index 74ff613..a50cf41 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -50,7 +50,7 @@
public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
@VisibleForTesting
- static final int DEFAULT_CARD_COUNT = 4;
+ static final int DEFAULT_CARD_COUNT = 2;
static final int CARD_CONTENT_LOADER_ID = 1;
private static final String TAG = "ContextualCardLoader";
@@ -141,42 +141,19 @@
}
}
- try {
- // The maximum cards are four small cards OR
- // one large card with two small cards OR
- // two large cards
- if (visibleCards.size() <= 2 || getNumberOfLargeCard(visibleCards) == 0) {
- // four small cards
- return visibleCards;
- }
+ if (!CardContentProvider.DELETE_CARD_URI.equals(mNotifyUri)) {
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
- if (visibleCards.size() == DEFAULT_CARD_COUNT) {
- hiddenCards.add(visibleCards.remove(visibleCards.size() - 1));
- }
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
+ ContextualCardLogUtils.buildCardListLog(visibleCards));
- if (getNumberOfLargeCard(visibleCards) == 1) {
- // One large card with two small cards
- return visibleCards;
- }
-
- hiddenCards.add(visibleCards.remove(visibleCards.size() - 1));
-
- // Two large cards
- return visibleCards;
- } finally {
- if (!CardContentProvider.DELETE_CARD_URI.equals(mNotifyUri)) {
- final MetricsFeatureProvider metricsFeatureProvider =
- FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
-
- metricsFeatureProvider.action(mContext,
- SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
- ContextualCardLogUtils.buildCardListLog(visibleCards));
-
- metricsFeatureProvider.action(mContext,
- SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,
- ContextualCardLogUtils.buildCardListLog(hiddenCards));
- }
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,
+ ContextualCardLogUtils.buildCardListLog(hiddenCards));
}
+ return visibleCards;
}
@VisibleForTesting
@@ -208,12 +185,6 @@
return cards;
}
- private int getNumberOfLargeCard(List<ContextualCard> cards) {
- return (int) cards.stream()
- .filter(card -> isLargeCard(card))
- .count();
- }
-
private boolean isLargeCard(ContextualCard card) {
return card.getSliceUri().equals(CONTEXTUAL_WIFI_SLICE_URI)
|| card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI)
diff --git a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
index 43a6a9b..65abe99 100644
--- a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
+++ b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
@@ -1,11 +1,12 @@
package com.android.settings.location;
-import static android.Manifest.permission.ACCESS_BACKGROUND_LOCATION;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import android.content.Context;
import android.location.LocationManager;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.permission.PermissionControllerManager;
import android.provider.Settings;
@@ -13,11 +14,12 @@
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
public class AppLocationPermissionPreferenceController extends
@@ -29,7 +31,12 @@
int mNumTotal = -1;
/** Total number of apps that has background location permission. */
@VisibleForTesting
- int mNumBackground = -1;
+ int mNumHasLocation = -1;
+
+ final AtomicInteger loadingInProgress = new AtomicInteger(0);
+ private int mNumTotalLoading = 0;
+ private int mNumHasLocationLoading = 0;
+
private final LocationManager mLocationManager;
private Preference mPreference;
@@ -52,52 +59,76 @@
@Override
public CharSequence getSummary() {
if (mLocationManager.isLocationEnabled()) {
- if (mNumTotal == -1 || mNumBackground == -1) {
+ if (mNumTotal == -1 || mNumHasLocation == -1) {
return mContext.getString(R.string.location_settings_loading_app_permission_stats);
}
return mContext.getResources().getQuantityString(
- R.plurals.location_app_permission_summary_location_on, mNumBackground,
- mNumBackground, mNumTotal);
+ R.plurals.location_app_permission_summary_location_on, mNumHasLocation,
+ mNumHasLocation, mNumTotal);
} else {
return mContext.getString(R.string.location_app_permission_summary_location_off);
}
}
+ private void setAppCounts(int numTotal, int numHasLocation) {
+ mNumTotal = numTotal;
+ mNumHasLocation = numHasLocation;
+ refreshSummary(mPreference);
+ }
+
@Override
public void updateState(Preference preference) {
super.updateState(preference);
mPreference = preference;
- final AtomicInteger loadingInProgress = new AtomicInteger(2);
refreshSummary(preference);
- // Bail out if location has been disabled.
- if (!mLocationManager.isLocationEnabled()) {
+ // Bail out if location has been disabled, or there's another loading request in progress.
+ if (!mLocationManager.isLocationEnabled() ||
+ loadingInProgress.get() != 0) {
return;
}
- PermissionControllerManager permController =
- mContext.getSystemService(PermissionControllerManager.class);
- permController.countPermissionApps(
- Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), 0,
- (numApps) -> {
- mNumTotal = numApps;
+ mNumTotalLoading = 0;
+ mNumHasLocationLoading = 0;
+ // Retrieve a list of users inside the current user profile group.
+ final List<UserHandle> users = mContext.getSystemService(
+ UserManager.class).getUserProfiles();
+ loadingInProgress.set(2 * users.size());
+ for (UserHandle user : users) {
+ final Context userContext = Utils.createPackageContextAsUser(mContext,
+ user.getIdentifier());
+ if (userContext == null) {
+ for (int i = 0; i < 2; ++i) {
if (loadingInProgress.decrementAndGet() == 0) {
- refreshSummary(preference);
+ setAppCounts(mNumTotalLoading, mNumHasLocationLoading);
}
- }, null);
-
- permController.countPermissionApps(
- Collections.singletonList(ACCESS_BACKGROUND_LOCATION),
- PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED,
- (numApps) -> {
- mNumBackground = numApps;
- if (loadingInProgress.decrementAndGet() == 0) {
- refreshSummary(preference);
- }
- }, null);
+ }
+ continue;
+ }
+ final PermissionControllerManager permController =
+ userContext.getSystemService(PermissionControllerManager.class);
+ permController.countPermissionApps(
+ Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), 0,
+ (numApps) -> {
+ mNumTotalLoading += numApps;
+ if (loadingInProgress.decrementAndGet() == 0) {
+ setAppCounts(mNumTotalLoading, mNumHasLocationLoading);
+ }
+ }, null);
+ permController.countPermissionApps(
+ Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION),
+ PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED,
+ (numApps) -> {
+ mNumHasLocationLoading += numApps;
+ if (loadingInProgress.decrementAndGet() == 0) {
+ setAppCounts(mNumTotalLoading, mNumHasLocationLoading);
+ }
+ }, null);
+ }
}
@Override
public void onLocationModeChanged(int mode, boolean restricted) {
- // 'null' is checked inside updateState(), so no need to check here.
- updateState(mPreference);
+ if (mPreference != null) {
+ updateState(mPreference);
+ }
}
}
diff --git a/src/com/android/settings/location/TopLevelLocationPreferenceController.java b/src/com/android/settings/location/TopLevelLocationPreferenceController.java
index baad780..ec58a34 100644
--- a/src/com/android/settings/location/TopLevelLocationPreferenceController.java
+++ b/src/com/android/settings/location/TopLevelLocationPreferenceController.java
@@ -8,18 +8,23 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManager;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.permission.PermissionControllerManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
public class TopLevelLocationPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop {
@@ -28,8 +33,10 @@
private final LocationManager mLocationManager;
/** Total number of apps that has location permission. */
private int mNumTotal = -1;
+ private int mNumTotalLoading = 0;
private BroadcastReceiver mReceiver;
private Preference mPreference;
+ private AtomicInteger loadingInProgress = new AtomicInteger(0);
public TopLevelLocationPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -66,16 +73,37 @@
super.updateState(preference);
mPreference = preference;
refreshSummary(preference);
- // Bail out if location has been disabled.
- if (!mLocationManager.isLocationEnabled()) {
+ // Bail out if location has been disabled, or there's another loading request in progress.
+ if (!mLocationManager.isLocationEnabled() ||
+ loadingInProgress.get() != 0) {
return;
}
- mContext.getSystemService(PermissionControllerManager.class).countPermissionApps(
- Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION),
- PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED,
- (numApps) -> {
- setLocationAppCount(numApps);
- }, null);
+ mNumTotalLoading = 0;
+ // Retrieve a list of users inside the current user profile group.
+ final List<UserHandle> users = mContext.getSystemService(
+ UserManager.class).getUserProfiles();
+ loadingInProgress.set(users.size());
+ for (UserHandle user : users) {
+ final Context userContext = Utils.createPackageContextAsUser(mContext,
+ user.getIdentifier());
+ if (userContext == null) {
+ if (loadingInProgress.decrementAndGet() == 0) {
+ setLocationAppCount(mNumTotalLoading);
+ }
+ continue;
+ }
+ final PermissionControllerManager permController =
+ userContext.getSystemService(PermissionControllerManager.class);
+ permController.countPermissionApps(
+ Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION),
+ PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED,
+ (numApps) -> {
+ mNumTotalLoading += numApps;
+ if (loadingInProgress.decrementAndGet() == 0) {
+ setLocationAppCount(mNumTotalLoading);
+ }
+ }, null);
+ }
}
@Override
@@ -98,7 +126,8 @@
}
private void refreshLocationMode() {
- // 'null' is checked inside updateState(), so no need to check here.
- updateState(mPreference);
+ if (mPreference != null) {
+ updateState(mPreference);
+ }
}
}
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index d1e55e4..f67afdc 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -24,6 +24,7 @@
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.media.LocalMediaManager;
import com.android.settingslib.media.MediaDevice;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
import java.util.List;
@@ -94,7 +95,9 @@
}
public void connectDevice(MediaDevice device) {
- mLocalMediaManager.connectDevice(device);
+ ThreadUtils.postOnBackgroundThread(() -> {
+ mLocalMediaManager.connectDevice(device);
+ });
}
public MediaDevice getMediaDeviceById(String id) {
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index 0a39bfd..2df16f5 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -64,7 +64,7 @@
public int getAvailabilityStatus(int subId) {
return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
? AVAILABLE
- : CONDITIONALLY_UNAVAILABLE;
+ : DISABLED_DEPENDENT_SETTING;
}
@Override
diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index bf9fc04..e497a9e 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -73,11 +73,6 @@
@Override
public Slice getSlice() {
- // Mobile data not available, thus return no Slice.
- if (!isMobileDataAvailable()) {
- return null;
- }
-
final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_network_cell);
final String title = mContext.getText(R.string.mobile_data_settings_title).toString();
@@ -85,20 +80,14 @@
// Return a Slice without the mobile data toggle when airplane mode is on.
if (isAirplaneModeEnabled()) {
- final CharSequence summary = mContext.getText(R.string.mobile_data_ap_mode_disabled);
- // Intent does nothing, but we have to pass an intent to the Row.
- final PendingIntent intent = PendingIntent.getActivity(mContext, 0 /* requestCode */,
- new Intent(), 0 /* flags */);
- final SliceAction deadAction =
- SliceAction.create(intent, icon, ListBuilder.ICON_IMAGE, title);
- final ListBuilder listBuilder = new ListBuilder(mContext, getUri(),
- ListBuilder.INFINITY)
- .setAccentColor(color)
- .addRow(new ListBuilder.RowBuilder()
- .setTitle(title)
- .setSubtitle(summary)
- .setPrimaryAction(deadAction));
- return listBuilder.build();
+ return buildUnavailableMobileDataSlice(title,
+ mContext.getText(R.string.mobile_data_ap_mode_disabled), icon, color);
+ }
+
+ // Return a Slice without the mobile data toggle when mobile data disabled.
+ if (!isMobileDataAvailable()) {
+ return buildUnavailableMobileDataSlice(title,
+ mContext.getText(R.string.sim_cellular_data_unavailable), icon, color);
}
final CharSequence summary = getSummary();
@@ -128,7 +117,7 @@
@Override
public void onNotifyChange(Intent intent) {
final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
- isMobileDataEnabled());
+ isMobileDataEnabled());
final int defaultSubId = getDefaultSubscriptionId(mSubscriptionManager);
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
@@ -212,6 +201,22 @@
return mTelephonyManager.isDataEnabled();
}
+ private Slice buildUnavailableMobileDataSlice(String title, CharSequence summary,
+ IconCompat icon, int color) {
+ final PendingIntent intent = PendingIntent.getActivity(mContext, 0 /* requestCode */,
+ new Intent(), 0 /* flags */);
+ final SliceAction deadAction =
+ SliceAction.create(intent, icon, ListBuilder.ICON_IMAGE, title);
+ final ListBuilder listBuilder = new ListBuilder(mContext, getUri(),
+ ListBuilder.INFINITY)
+ .setAccentColor(color)
+ .addRow(new ListBuilder.RowBuilder()
+ .setTitle(title)
+ .setSubtitle(summary)
+ .setPrimaryAction(deadAction));
+ return listBuilder.build();
+ }
+
/**
* Listener for mobile data state changes.
*
diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
index 58e1916..f7b3222 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -123,11 +123,14 @@
return new ComponentName(ci.packageName, ci.name);
}
// old service backed rule
- final String configurationActivity =
- ci.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
- if (configurationActivity != null) {
- return ComponentName.unflattenFromString(configurationActivity);
+ if (ci.metaData != null) {
+ final String configurationActivity = ci.metaData.getString(
+ ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+ if (configurationActivity != null) {
+ return ComponentName.unflattenFromString(configurationActivity);
+ }
}
+
return null;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 2ee6d0c..2dd0d9b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -33,16 +33,20 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.provider.Settings;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
+import androidx.preference.PreferenceScreen;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -51,6 +55,7 @@
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.XmlTestUtils;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
@@ -66,6 +71,7 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@@ -117,6 +123,14 @@
private MenuItem mAdvancedPageMenu;
@Mock
private BatteryInfo mBatteryInfo;
+ @Mock
+ private ContentResolver mContentResolver;
+ @Mock
+ private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+ @Mock
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
private List<BatterySipper> mUsageList;
private Context mRealContext;
@@ -148,7 +162,7 @@
.thenReturn(sAdditionalBatteryInfoIntent);
when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt()))
- .thenReturn(TIME_SINCE_LAST_FULL_CHARGE_US);
+ .thenReturn(TIME_SINCE_LAST_FULL_CHARGE_US);
when(mNormalBatterySipper.getUid()).thenReturn(UID);
mNormalBatterySipper.totalPowerMah = POWER_MAH;
@@ -176,6 +190,11 @@
mFragment.mScreenUsagePref = mScreenUsagePref;
mFragment.mLastFullChargePref = mLastFullChargePref;
mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
+ ReflectionHelpers.setField(mFragment, "mVisibilityLoggerMixin", mVisibilityLoggerMixin);
+ ReflectionHelpers.setField(mFragment, "mBatteryBroadcastReceiver",
+ mBatteryBroadcastReceiver);
+ doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+ when(mFragment.getContentResolver()).thenReturn(mContentResolver);
}
@Test
@@ -207,10 +226,10 @@
public void nonIndexableKeys_MatchPreferenceKeys() {
final Context context = RuntimeEnvironment.application;
final List<String> niks =
- PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
+ PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
final List<String> keys =
- XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
+ XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
assertThat(keys).containsAllIn(niks);
}
@@ -223,25 +242,25 @@
mFragment.restartBatteryTipLoader();
verify(mLoaderManager)
- .restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
+ .restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
}
@Test
public void showBothEstimates_summariesAreBothModified() {
when(mFeatureFactory.powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
- .thenReturn(true);
+ .thenReturn(true);
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) {
return mRealContext.getString(
- R.string.power_usage_old_debug, invocation.getArguments()[0]);
+ R.string.power_usage_old_debug, invocation.getArguments()[0]);
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getOldEstimateDebugString(any());
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) {
return mRealContext.getString(
- R.string.power_usage_enhanced_debug, invocation.getArguments()[0]);
+ R.string.power_usage_enhanced_debug, invocation.getArguments()[0]);
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
@@ -336,6 +355,24 @@
verify(mFragment).restartBatteryTipLoader();
}
+ @Test
+ public void onResume_registerContentObserver() {
+ mFragment.onResume();
+
+ verify(mContentResolver).registerContentObserver(
+ Settings.Global.getUriFor(Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
+ false,
+ mFragment.mSettingsObserver);
+ }
+
+ @Test
+ public void onPause_unregisterContentObserver() {
+ mFragment.onPause();
+
+ verify(mContentResolver).unregisterContentObserver(
+ mFragment.mSettingsObserver);
+ }
+
public static class TestFragment extends PowerUsageSummary {
private Context mContext;
@@ -349,6 +386,12 @@
}
@Override
+ protected ContentResolver getContentResolver() {
+ // Override it so we can access this method in test
+ return super.getContentResolver();
+ }
+
+ @Override
void showBothEstimates() {
List<BatteryInfo> fakeBatteryInfo = new ArrayList<>(2);
BatteryInfo info1 = new BatteryInfo();
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index c2a3aa9..b7c21b8 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -61,6 +61,14 @@
}
@Test
+ public void loadInBackground_legacyMode_shouldReturnNothing() {
+ assertThat(mContext.getResources().getBoolean(R.bool.config_use_legacy_suggestion))
+ .isTrue();
+
+ assertThat(mContextualCardLoader.loadInBackground()).isEmpty();
+ }
+
+ @Test
public void getDisplayableCards_twoEligibleCards_shouldShowAll() {
final List<ContextualCard> cards = getContextualCardList().stream().limit(2)
.collect(Collectors.toList());
@@ -72,54 +80,17 @@
}
@Test
- public void getDisplayableCards_fiveEligibleCardsNoLarge_shouldShowDefaultCardCount() {
- final List<ContextualCard> fiveCards = getContextualCardListWithNoLargeCard();
- doReturn(fiveCards).when(mContextualCardLoader).filterEligibleCards(anyList());
+ public void getDisplayableCards_fourEligibleCards_shouldShowDefaultCardCount() {
+ final List<ContextualCard> fourCards = getContextualCardList();
+ doReturn(fourCards).when(mContextualCardLoader).filterEligibleCards(anyList());
- final List<ContextualCard> result = mContextualCardLoader.getDisplayableCards(
- fiveCards);
+ final List<ContextualCard> result = mContextualCardLoader
+ .getDisplayableCards(fourCards);
assertThat(result).hasSize(DEFAULT_CARD_COUNT);
}
@Test
- public void getDisplayableCards_threeEligibleCardsOneLarge_shouldShowThreeCards() {
- final List<ContextualCard> cards = getContextualCardList().stream().limit(2)
- .collect(Collectors.toList());
- cards.add(new ContextualCard.Builder()
- .setName("test_gesture")
- .setCardType(ContextualCard.CardType.SLICE)
- .setSliceUri(Uri.parse(
- "content://com.android.settings.test.slices/action/gesture_pick_up"))
- .build());
- doReturn(cards).when(mContextualCardLoader).filterEligibleCards(anyList());
-
- final List<ContextualCard> result = mContextualCardLoader.getDisplayableCards(cards);
-
- assertThat(result).hasSize(3);
- }
-
- @Test
- public void getDisplayableCards_threeEligibleCardsTwoLarge_shouldShowTwoCards() {
- final List<ContextualCard> threeCards = getContextualCardList().stream().limit(3)
- .collect(Collectors.toList());
- doReturn(threeCards).when(mContextualCardLoader).filterEligibleCards(anyList());
-
- final List<ContextualCard> result = mContextualCardLoader.getDisplayableCards(
- threeCards);
-
- assertThat(result).hasSize(2);
- }
-
- @Test
- public void loadInBackground_legacyMode_shouldReturnNothing() {
- assertThat(mContext.getResources().getBoolean(R.bool.config_use_legacy_suggestion))
- .isTrue();
-
- assertThat(mContextualCardLoader.loadInBackground()).isEmpty();
- }
-
- @Test
public void getDisplayableCards_refreshCardUri_shouldLogContextualCardDisplay() {
mContextualCardLoader.mNotifyUri = CardContentProvider.REFRESH_CARD_URI;
@@ -167,32 +138,4 @@
.build());
return cards;
}
-
- private List<ContextualCard> getContextualCardListWithNoLargeCard() {
- final List<ContextualCard> cards = new ArrayList<>();
- cards.add(new ContextualCard.Builder()
- .setName("test_rotate")
- .setCardType(ContextualCard.CardType.SLICE)
- .setSliceUri(
- Uri.parse("content://com.android.settings.test.slices/action/auto_rotate"))
- .build());
- cards.add(new ContextualCard.Builder()
- .setName("test_flashlight")
- .setCardType(ContextualCard.CardType.SLICE)
- .setSliceUri(
- Uri.parse("content://com.android.settings.test.slices/action/flashlight"))
- .build());
- cards.add(new ContextualCard.Builder()
- .setName("test_bt")
- .setCardType(ContextualCard.CardType.SLICE)
- .setSliceUri(Uri.parse("content://android.settings.test.slices/action/bluetooth"))
- .build());
- cards.add(new ContextualCard.Builder()
- .setName("test_gesture")
- .setCardType(ContextualCard.CardType.SLICE)
- .setSliceUri(Uri.parse(
- "content://com.android.settings.test.slices/action/gesture_pick_up"))
- .build());
- return cards;
- }
}
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index bddd5fe..7392ec7 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -76,7 +76,7 @@
@Test
public void getSummary_whenLocationAppCountIsOne_shouldShowSingularString() {
mLocationManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
- mController.mNumBackground = 1;
+ mController.mNumHasLocation = 1;
mController.mNumTotal = 1;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
@@ -86,7 +86,7 @@
@Test
public void getSummary_whenLocationAppCountIsGreaterThanOne_shouldShowPluralString() {
mLocationManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
- mController.mNumBackground = 5;
+ mController.mNumHasLocation = 5;
mController.mNumTotal = 10;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index e853c47..30b5408 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -16,7 +16,7 @@
package com.android.settings.network.telephony;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.google.common.truth.Truth.assertThat;
@@ -86,10 +86,10 @@
}
@Test
- public void getAvailabilityStatus_invalidSubscription_returnUnavailable() {
+ public void getAvailabilityStatus_invalidSubscription_returnDisabledDependentSetting() {
mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
index e59fbaf..ae6f568 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
@@ -170,21 +170,47 @@
}
@Test
- public void isMobileDataAvailable_noSubscriptions_returnsNull() {
+ public void isMobileDataAvailable_noSubscriptions_slicePrimaryActionIsEmpty() {
doReturn(new ArrayList<>()).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
+ final Slice mobileData = mMobileDataSlice.getSlice();
- final Slice slice = mMobileDataSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);
+ assertThat(metadata.getTitle())
+ .isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
- assertThat(slice).isNull();
+ assertThat(metadata.getSubtitle())
+ .isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
+
+ final List<SliceAction> toggles = metadata.getToggles();
+ assertThat(toggles).hasSize(0);
+
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final PendingIntent pendingIntent = primaryAction.getAction();
+ final Intent actionIntent = pendingIntent.getIntent();
+
+ assertThat(actionIntent).isNull();
}
@Test
- public void isMobileDataAvailable_nullSubscriptions_returnsNull() {
+ public void isMobileDataAvailable_nullSubscriptions_slicePrimaryActionIsEmpty() {
doReturn(null).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
+ final Slice mobileData = mMobileDataSlice.getSlice();
- final Slice slice = mMobileDataSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);
+ assertThat(metadata.getTitle())
+ .isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
- assertThat(slice).isNull();
+ assertThat(metadata.getSubtitle())
+ .isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
+
+ final List<SliceAction> toggles = metadata.getToggles();
+ assertThat(toggles).hasSize(0);
+
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final PendingIntent pendingIntent = primaryAction.getAction();
+ final Intent actionIntent = pendingIntent.getIntent();
+
+ assertThat(actionIntent).isNull();
}
@Test