Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97e701a..c9f4643 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -103,7 +103,9 @@
<uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" />
<uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
+ <uses-permission android:name="android.permission.READ_DREAM_STATE" />
+ <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" />
+
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
android:theme="@style/Theme.Settings"
diff --git a/res/layout/emergency_gesture_switch_bar.xml b/res/layout/emergency_gesture_switch_bar.xml
new file mode 100644
index 0000000..30c32f5
--- /dev/null
+++ b/res/layout/emergency_gesture_switch_bar.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!-- For use in a LayoutPreference -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical">
+
+ <com.android.settings.widget.SwitchBar
+ android:id="@+id/switch_bar"
+ android:minHeight="?android:attr/actionBarSize"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:paddingStart="0dp"
+ android:theme="?attr/switchBarTheme"/>
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="@dimen/actionbar_subsettings_contentInsetStart"
+ android:layout_marginVertical="16dp"
+ android:text="@string/emergency_gesture_screen_summary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/notif_priority_conversation_preference.xml b/res/layout/notif_priority_conversation_preference.xml
index d07bc23..c93abf2 100644
--- a/res/layout/notif_priority_conversation_preference.xml
+++ b/res/layout/notif_priority_conversation_preference.xml
@@ -67,6 +67,7 @@
android:focusable="false"
android:ellipsize="end"
android:maxLines="4"
+ android:layout_below="@id/icon_label_container"
android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
android:visibility="gone" />
</com.android.settings.notification.NotificationButtonRelativeLayout>
diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
index 77b90a1..44b9a28 100644
--- a/res/layout/reset_esim_checkbox.xml
+++ b/res/layout/reset_esim_checkbox.xml
@@ -33,7 +33,7 @@
android:layout_gravity="center_vertical"
android:focusable="false"
android:clickable="false"
- android:checked="true"
+ android:checked="false"
android:duplicateParentState="true"/>
<LinearLayout
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 703db6a..b821ee0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangskik kennisgewings outomaties volgens relevantheid"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare kennisgewingterugvoer"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Dui verstellings aan wat aan kennisgewings gemaak is en wys die opsie om terugvoer aan die stelsel te verskaf"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Stel kennisgewingbelangrikheid terug"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Stel belangrikheidinstellings terug wat gebruiker verander het, en laat kennisgewingassistent toe om te prioritiseer"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde handelinge en antwoorde"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Wys voorgestelde handelinge en antwoorde outomaties"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Wys onlangse en gesluimerde kennisgewings"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Onbeskikbaar wanneer gekoppel aan <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Sien meer"</string>
<string name="see_less" msgid="2642392725363552793">"Sien minder"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Skakel <xliff:g id="CARRIER_NAME">%1$s</xliff:g> aan?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Skakel SIM aan?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Skakel oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Skakel oor om SIM-kaart te gebruik?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Net een SIM kan op \'n slag aktief wees.\n\nAs jy na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> toe oorskakel, sal dit nie jou <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-diens kanselleer nie."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Net een afgelaaide SIM kan op \'n slag aktief wees.\n\nAs jy na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> toe oorskakel, sal dit nie jou <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-diens kanselleer nie."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Net een SIM kan op \'n slag aktief wees.\n\nAs jy oorskakel, sal dit nie jou <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-diens kanselleer nie."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skakel oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Koppel tans aan netwerk …"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skakel tans oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan nie na \'n ander diensverskaffer toe oorskakel nie"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Kan weens \'n fout nie na \'n ander diensverskaffer toe oorskakel nie."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Skakel <xliff:g id="CARRIER_NAME">%1$s</xliff:g> af?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Skakel SIM af?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Skakel tans SIM af <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan nie diensverskaffer deaktiveer nie"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan nie diensverskaffer deaktiveer nie"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Iets was fout en jou diensverskaffer kon nie gedeaktiveer word nie."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gebruik 2 SIM-kaarte?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Hierdie toestel kan 2 SIM-kaarte op dieselfde tyd aktief hê. Tik op \"Nee, dankie\" om aan te hou om 1 SIM op \'n slag te gebruik."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Herbegin toestel?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Herbegin jou toestel om te begin. Dan kan jy nog \'n SIM byvoeg."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Gaan voort"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Herbegin"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, dankie"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Skakel oor"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan nie SIM aktiveer nie"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwyder die SIM en voeg dit weer in. Herbegin jou toestel as die probleem voortduur."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer weer om die SIM aan te skakel. Herbegin jou toestel as die probleem voortduur."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vee hierdie afgelaaide SIM uit?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"As jy hierdie SIM uitvee, word <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-diens van hierdie toestel verwyder.\n\nDiens vir <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sal nie gekanselleer word nie."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vee uit"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sal aanskakel"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aan"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Af"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'s"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Vliegtuigveilige netwerke"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Soek en koppel aan vliegtuigveilige netwerke"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, vliegtuigveilig"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Oproepe en SMS\'e"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑fi-oproepe"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Maak en ontvang oproepe oor niediensverskaffer-netwerke soos wi-fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Met Wi-fi-oproepe kan jy oproepe oor niediensverskaffer-netwerke soos sommige wi-fi-netwerke maak en ontvang.\n\nMet Kruis-SIM-oproepe kan jy die mobiele data van \'n SIM gebruik om oproepe van \'n ander SIM af maak en ontvang."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Oproepe"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 221a9ac..1941c10 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"በተዛማጅነት ማሳወቂያዎችን በራስሰር ደረጃ ስጥ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ራስ-አስማሚ የማሳወቂያ ግብረመልስ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"በማስታወቂያዎች ላይ የተደረጉ ማስተካከያዎችን ያመልክቱ እና ለስርዓቱ ግብረመልስ ለመስጠት አማራጩን ያሳዩ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"የማሳወቂያ አስፈላጊነት ዳግም ያስጀምሩ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"በተጠቃሚ የተቀየሩትን የአስፈላጊነት ቅንብሮችን ዳግም ያስጀምሩ እና የማሳወቂያ ረዳት ቅድሚያ እንዲሰጥ ይፍቀዱ"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"በጥቆማ የቀረቡ እርምጃዎች እና ምላሾች"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"በጥቆማ የቀረቡ እርምጃዎችን እና ምላሾችን በራስሰር አሳይ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"የቅርብ ጊዜ እና ያሸለቡ ማሳወቂያዎችን አሳይ"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ከ<xliff:g id="CARRIER">%1$s</xliff:g> ጋር ሲገናኝ የማይገኝ"</string>
<string name="see_more" msgid="7499355691042812723">"ተጨማሪ ይመልከቱ"</string>
<string name="see_less" msgid="2642392725363552793">"ያነሰ ይመልከቱ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይብራ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ሲም ይብራ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይቀየር?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ወደ ሲም ካርድ መጠቀም ይቀይሩ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"በአንድ ጊዜ አንድ ሲም ብቻ ነው ገባሪ ሊሆን የሚችለው።\n\nወደ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> መቀየር የ<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"በአንድ ጊዜ አንድ የወረደ ሲም ብቻ ነው ገቢር መሆን የሚችለው።\n\nወደ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> መቀየር የ<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"በአንድ ጊዜ አንድ ሲም ብቻ ነው ገቢር ሊሆን የሚችለው።\n\nመቀየር የ<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይቀይሩ"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ከአውታረ መረብ ጋር በመገናኘት ላይ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> በመቀየር ላይ"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"አገልግሎት አቅራቢን መቀየር አልተቻለም"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"በስህተት ምክንያት አገልግሎት አቅራቢው መቀየር አልተቻለም።"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይጥፋ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ሲም ይጥፋ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ሲምን በማጥፋት ላይ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"አገልግሎት አቅራቢን ማሰናከል አልተቻለም"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"አገልግሎት አቅራቢን ማሰናከል አልተቻለም"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"የሆነ ችግር ተፈጥሯል፣ እና የእርስዎ አገልግሎት አቅራቢ ሊሰናከል አልቻለም።"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ሲሞች ይጠቀሙ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ይህ መሣሪያ በአንድ ጊዜ 2 ሲሞች ነው ሊኖሩት የሚችሉት። በአንድ ጊዜ 1 ሲም መጠቀሙን ለመቀጠል «አይ፣ አመሰግናለሁ»ን መታ ያድርጉ።"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"መሣሪያ ዳግም ይነሳ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ለመጀመር የእርስዎን መሣሪያ ዳግም ያስነሱት። ከዚያ ሌላ ሲም ማከል ይችላሉ።"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ቀጥል"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ዳግም አስነሳ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"አይ፣ አመሰግናለሁ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ማብሪያ/ማጥፊያ"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ሲምን ማግበር አልተቻለም"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ሲሙን ያስወጡትና እንደገና ያስገቡት። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ሲሙን እንደገና ለማብራት ይሞክሩ። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ይህ የወረደ ሲም ይደምሰስ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ይህን ሲም መደምሰስ የ<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> አገልግሎቱን ከዚህ መሣሪያ ያስወግደዋል።\n\nለ<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> የሆነ አገልግሎት አይሰረዝም።"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ደምስስ"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ብሉቱዝ ይበራል"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"አብራ"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"አጥፋ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"በይነመረብ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMዎች"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"የአውሮፕላን ደህንነታቸው የተጠበቀ አውታረመረቦች"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"የአውሮፕላን ደህንነታቸው የተጠበቀ አውታረመረቦችን ያግኙ እና ያገናኙ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"አውሮፕላን፣ የአውሮፕላን ድህንነቱ የተጠበቀ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ጥሪዎች እና ኤስኤምኤስ"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"የWi-Fi ጥሪ ማድረጊያ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"እንደ Wi‑Fi ባሉ አገልግሎት አቅራቢ ባልሆኑ አውታረ መረቦች ላይ ጥሪዎችን ያድርጉ እና ይቀበሉ"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"የWi-Fi ጥሪ ማድረጊያ እንደ አንዳንድ የWi‑Fi አውታረ መረቦች ባሉ አገልግሎት አቅራቢ ባልሆኑ አውታረመረቦች ላይ ጥሪዎችን እንዲያደርጉ እና እንዲቀበሉ ያስችልዎታል፡፡\n\nከሌላ ሲም ጥሪዎችን ለማድረግ እና ለመቀበል መስቀለኛ-ሲም ጥሪ አንድ ሲም የሞባይል መረጃን እንዲጠቀሙ ያስችልዎታል።"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ጥሪዎች"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"ኤስኤምኤስ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9f94f42..136aae4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3653,6 +3653,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ترتيب الإشعارات تلقائيًا حسب مدى الصلة بالموضوع"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تعليقات عن الإشعارات التكيُّفية"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"الإشارة إلى التعديلات التي تم إجراؤها على الإشعارات وإظهار خيار لتقديم تعليقات إلى النظام"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"إعادة ضبط أهمية الإشعارات"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"إعادة ضبط إعدادات الأهمية التي غيّرها المستخدم والسماح لمساعد الإشعارات بمنح الأولوية"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"الإجراءات والردود المقترَحة"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"عرض الإجراءات والردود المقترحة تلقائيًا"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"عرض الإشعارات الحديثة والمؤجلة"</string>
@@ -3757,7 +3759,7 @@
<string name="other_conversations" msgid="551178916855139870">"المحادثات غير ذات الأولوية"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"المحادثات التي أجريت تغييرات عليها"</string>
<string name="recent_conversations" msgid="471678228756995274">"المحادثات الأخيرة"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"محو العناصر الحديثة"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"محو المحادثات الحديثة"</string>
<string name="clear" msgid="5092178335409471100">"محو"</string>
<string name="important_bubble" msgid="7911698275408390846">"تظهر المحادثات ذات الأولوية كفقاعات"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"تظهر المحادثات ذات الأولوية في أعلى مركز الإشعارات المنسدل. يمكنك أيضًا ضبطها لتظهر كفقاعات ولا تتقيّد بميزة \"عدم الإزعاج\"."</string>
@@ -3971,7 +3973,7 @@
<string name="summary_divider_text" msgid="8836285171484563986">"، "</string>
<string name="summary_range_symbol_combination" msgid="8447490077794415525">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
<string name="summary_range_verbal_combination" msgid="6022314482293187463">"<xliff:g id="START">%1$s</xliff:g> إلى <xliff:g id="END">%2$s</xliff:g>"</string>
- <string name="zen_mode_conversations_title" msgid="5491912973456026379">"محادثات"</string>
+ <string name="zen_mode_conversations_title" msgid="5491912973456026379">"المحادثات"</string>
<string name="zen_mode_conversations_section_title" msgid="666809483050936026">"المحادثات التي يمكنها مقاطعة عمل الميزة"</string>
<string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"كل المحادثات"</string>
<string name="zen_mode_from_important_conversations" msgid="528050873364229253">"المحادثات ذات الأولوية"</string>
@@ -5169,11 +5171,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"عدم التوفُّر عند الربط بمشغّل شبكة الجوّال <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"عرض المزيد"</string>
<string name="see_less" msgid="2642392725363552793">"عرض عناصر أقل"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"هل تريد تفعيل <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"هل تريد تفعيل شريحة SIM؟"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"هل تريد التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"هل تريد التبديل إلى استخدام شريحة SIM؟"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى إلغاء خدمة <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"جارٍ الاتصال بالشبكة…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"جارٍ التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"يتعذَّر تبديل مشغِّل شبكة الجوّال"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"يتعذَّر تبديل مشغِّل شبكة الجوّال بسبب حدوث خطأ."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"هل تريد إيقاف <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"هل تريد إيقاف شريحة SIM؟"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"جارٍ إيقاف شريحة SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"يتعذّر إيقاف مشغِّل شبكة الجوّال"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"يتعذّر إيقاف مشغِّل شبكة الجوّال"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"حدث خطأ ما أدى إلى تعذُّر إيقاف مشغِّل شبكة الجوّال."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"هل تريد استخدام شريحتَي SIM؟"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"يمكن تفعيل شريحتَي SIM على هذا الجهاز في وقتٍ واحد. لمتابعة استخدام شريحة SIM واحدة في كل مرة، انقر على \"لا، شكرًا\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"هل تريد إعادة تشغيل الجهاز؟"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"للبدء، أعِد تشغيل جهازك. ويمكنك بعد ذلك إضافة شريحة SIM أخرى."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"متابعة"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"إعادة التشغيل"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"لا، شكرًا"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"تبديل"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"يتعذّر تفعيل شريحة SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"يجب إزالة شريحة SIM ثم إدخالها مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"حاوِل تفعيل شريحة SIM مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"هل تريد محو بيانات شريحة SIM هذه التي تم تنزيلها؟"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"سيؤدي محو بيانات شريحة SIM هذه إلى إزالة خدمة <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> من هذا الجهاز.\n\nولن يتم إلغاء خدمة <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"محو البيانات"</string>
@@ -5320,4 +5345,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"سيتم تفعيل البلوتوث."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"مفعّلة"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"غير مفعّلة"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"الإنترنت"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"شرائح SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"الشبكات الآمنة في وضع الطيران"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"العثور على الشبكات الآمنة في وضع الطيران والاتصال بها"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"وضع الطيران، آمنة في وضع الطيران"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"المكالمات والرسائل القصيرة SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"الاتصال عبر Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"يمكنك إجراء مكالمات وتلقّيها عبر شبكات غير تابعة لمشغّلي شبكات الجوّال، مثل عبر شبكة Wi-Fi."</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"يسمح لك الاتصال عبر Wi-Fi بإجراء مكالمات وتلقّيها عبر الشبكات غير التابعة لمشغّلي شبكات الجوّال، مثل بعض شبكات Wi‑Fi.\n\nيسمح لك الاتصال عبر شريحة SIM بالاستفادة من بيانات الجوّال لشريحة SIM لإجراء مكالمات وتلقّيها من شريحة SIM أخرى."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"المكالمات"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 79f6612..191ef1f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্ৰাসংগিকতা অনুযায়ী জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে ক্ৰমত সজাওক"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অভিযোজিত জাননীৰ মতামত"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"জাননীসমূহত ঘটোৱা সালসলনিসমূহ দৰ্শায় আৰু ছিষ্টেমটোক মতামত জনাবলৈ বিকল্পসমূহ দেখুৱায়"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"জাননীৰ গুৰুত্ব ৰিছেট কৰক"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ব্যৱহাৰকাৰীয়ে সলনি কৰা গুৰুত্বৰ ছেটিং ৰিছেট কৰক আৰু জাননী সহায়কক অগ্ৰাধিকাৰ নিৰ্ধাৰণ কৰিবলৈ অনুমতি দিয়ক"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"পৰামর্শ হিচাপে পোৱা কার্য আৰু প্ৰত্যুত্তৰসমূহ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"পৰামর্শ হিচাপে পোৱা কার্য & প্ৰত্যুত্তৰসমূহ স্বয়ংক্ৰিয়ভাৱে দেখুৱাওক"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"শেহতীয়া আৰু স্নুজ কৰা জাননীসমূহ দেখুৱাওক"</string>
@@ -4126,7 +4128,7 @@
<string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>ৰ অসুবিধা নিদিবলৈ থকা প্ৰৱেশৰ অনুমতি প্ৰত্যাহাৰ কৰিবনে?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
<string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ নকৰিব"</string>
- <string name="ignore_optimizations_off" msgid="9186557038453586295">"অপ্টিমাইজ"</string>
+ <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
<string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"আপোনাৰ বেটাৰি খৰকৈ শেষ কৰিব পাৰে। এপটোক নেপথ্যত বেটাৰি ব্যৱহাৰ কৰাত আৰু বাধা দিয়া নহ’ব।"</string>
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"বেটাৰিৰ অৱস্থা উন্নত কৰাৰ বাবে পৰামৰ্শ দিয়া হৈছে"</string>
<string name="ignore_optimizations_title" msgid="3464172726254542889">"<xliff:g id="APP">%s</xliff:g>-ক বেটাৰি অপ্টিমাইজেশ্বন অবজ্ঞা কৰিবলৈ অনুমতি দিবনে?"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"টেবলেটটো পৰীক্ষা কৰিবলৈ টিপক"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইচটো পৰীক্ষা কৰিবলৈ টিপক"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত টিপক।"</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"জৰুৰীকালীন SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ পৰিচালনা কৰা"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"পাৱাৰ বুটামটো ক্ষিপ্ৰতাৰে ৫ বাৰ টিপি জৰুৰীকালীন SOS কাৰ্যবিলাক আৰম্ভ কৰক।"</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"সকীয়নিৰ ধ্বনি"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"কাৰ্যবিলাক আৰম্ভ কৰাৰ পূৰ্বে সতৰ্ক কৰি দিয়ক"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"জাননীৰ বাবে ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"জাননীবিলাক চাবলৈ আপোনাৰ ফ\'নটোৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰত ওপৰৰ পৰা তললৈ আঙুলি বুলাওক।"</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিলে উপলব্ধ নহয়"</string>
<string name="see_more" msgid="7499355691042812723">"অধিক চাওক"</string>
<string name="see_less" msgid="2642392725363552793">"কমকৈ চাওক"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> অন কৰিবনে?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ছিম অন কৰিবনে?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিবনে?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ছিম কাৰ্ড ব্যৱহাৰলৈ সলনি কৰিবনে?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"এবাৰত কেৱল এখন ছিমহে সক্ৰিয় হৈ থাকিব পাৰে। \n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিলে আপোনাৰ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"এটা সময়ত ডাউনল’ড কৰা এখন ছিমহে সক্ৰিয় কৰিব পাৰি। \n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিলে আপোনাৰ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"এবাৰত কেৱল এখন ছিমহে সক্ৰিয় হৈ থাকিব পাৰে। \n\nসলনি কৰিলে আপোনাৰ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰক"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"নেটৱৰ্কৰ সৈতে সংযোগ কৰি থকা হৈছে…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰি থকা হৈছে"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"বাহক সলনি কৰিব নোৱাৰি"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"কিবা এটা আসোঁৱাহ থকাৰ কাৰণে বাহক সলনি কৰিব নোৱাৰি।"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> অফ কৰিবনে?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ছিম অফ কৰিবনে?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ছিম অফ কৰি থকা হৈছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"বাহকক অক্ষম কৰিব নোৱাৰি"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"বাহকক অক্ষম কৰিব নোৱাৰি"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কিবা ভুল হ’ল আৰু সেয়ে আপোনাৰ বাহকক অক্ষম কৰিব পৰা নগ’ল।"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"২ খন ছিম ব্যৱহাৰ কৰিবনে?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"এই ডিভাইচটোত এবাৰত ২ খন ছিম সক্ৰিয় হৈ থাকিব পাৰে। এবাৰত ১ খন ছিম ব্যৱহাৰ কৰাটো অব্যাহত ৰাখিবলৈ \"নালাগে ধন্যবাদ\"ত টিপক।"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ডিভাইচটো ৰিষ্টাৰ্ট কৰিবনে?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"আৰম্ভ কৰিবলৈ আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক। তাৰ পাছত আপুনি অন্য এখন ছিম যোগ কৰিব পাৰে।"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"অব্যাহত ৰাখক"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ৰিষ্টাৰ্ট কৰক"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"নালাগে, ধন্যবাদ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"সলনি কৰক"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ছিমখন সক্ৰিয় কৰিব নোৱাৰি"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ছিমখন আঁতৰাওক আৰু পুনৰ ভৰাওক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ছিমখন পুনৰ অন কৰিবলৈ চেষ্টা কৰক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"এই ডাউনল’ড কৰা ছিমখন মচিবনে?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"এই ছিমখন আঁতৰালে এই ডিভাইচটোৰ পৰা <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> সেৱা আঁতৰোৱা হ’ব।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>ৰ সেৱা বাতিল কৰা নহয়।"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"মচক"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ব্লুটুথ অন কৰা হ’ব"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"অন আছে"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"অফ আছে"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ইণ্টাৰনেট"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ছিম"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক বিচাৰক আৰু তাৰ সৈতে সংযোগ কৰক"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"এয়াৰপ্লেন, এয়াৰপ্লেন-সুৰক্ষিত"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"কল আৰু এছএমএছ"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ৱাই-ফাই কলিং"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক নোহোৱা নেটৱৰ্কৰ জৰিয়তে কল কৰক আৰু লাভ কৰক"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ৱাই-ফাই কলিঙৰ সুবিধাটোৱে আপোনাক কিছুমান ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক নোহোৱা নেটৱৰ্কৰ জৰিয়তে কল কৰিবলৈ আৰু লাভ কৰিবলৈ অনুমতি দিয়ে।\n\nক্ৰছ-ছিম কলিঙৰ সুবিধাটোৱে আপোনাক অন্য ছিমৰ পৰা কল কৰিবলৈ আৰু লাভ কৰিবলৈ এখন ছিমৰ ম’বাইল ডেটাৰ লাভ আদায় কৰিবলৈ অনুমতি দিয়ে।"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"এছএমএছ"</string>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index d01c0bc..9dda155 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirişləri avtomatik olaraq aktuallığına görə sıralayın"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptiv bildiriş rəyi"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirişlərə edilən tənzimləmələri göstərin və sistemə rəy bildirmək üçün seçimi göstərin"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildiriş əhəmiyyətliliyini sıfırlayın"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"İstifadəçinin dəyişdiyi əhəmiyyətlilik ayarlarını sıfırlayın və bildiriş assistentinin prioritetləşdirməsinə icazə verin"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Təklif edilən əməliyyat və cavablar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Təklif edilən əməliyyat və cavabları avtomatik göstərin"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Son və mürgü rejiminə keçirilmiş bildirişləri göstərin"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ünvanına qoşulduqda əlçatan deyil"</string>
<string name="see_more" msgid="7499355691042812723">"Ətraflı"</string>
<string name="see_less" msgid="2642392725363552793">"Baxışı kiçildin"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktiv edilsin?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktiv edilsin?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçilsin?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kart istifadəsinə keçilsin?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Eyni vaxtda yalnız bir SIM aktiv ola bilər.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatoruna keçdikdə <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Eyni vaxtda yalnız bir endirilmiş SIM aktiv ola bilər.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatoruna keçdikdə <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Eyni vaxtda yalnız bir SIM aktiv ola bilər.\n\nDigərinə keçdikdə <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçin"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Şəbəkəyə qoşulur…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçirsiniz"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Başqa operatora keçmək mümkün deyil"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Xəta səbəbi ilə başqa operatora keçmək mümkün deyil."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktiv edilsin?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktiv edilsin?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM deaktiv edilir<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatoru deaktiv etmək mümkün deyil"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatoru deaktiv etmək mümkün deyil"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xəta baş verdi və operatoru deaktiv etmək mümkün olmadı."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM-dən istifadə etmək istəyirsiniz?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu cihazda eyni vaxtda 2 SIM aktiv ola bilər. Eyni vaxtda 1 SIM-dən istifadəyə davam etmək üçün \"Xeyr, təşəkkürlər\" seçiminə toxunun."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Cihaz yenidən başladılsın?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Başlatmaq üçün cihazı yenidən başladın. Sonra başqa SIM əlavə edə bilərsiniz."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Davam edin"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Yenidən başladın"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Xeyr, təşəkkür"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Keçin"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-i aktiv etmək mümkün deyil"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-i çıxarıb yenidən taxın. Problem həll olmasa, cihazı yenidən başladın."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-i yenidən aktiv etməyə çalışın. Problem həll olmasa, cihazı yenidən başladın."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Endirilən SIM silinsin?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM silindikdə <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> xidməti bu cihazdan silinəcək.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> üçün xidmət ləğv edilməyəcək."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Silin"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktivləşəcək"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktiv"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Deaktiv"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-lər"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Güvənli təyyarə şəbəkələri"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Güvənli təyyarə şəbəkələrini tapın və qoşulun"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"təyyarə, güvənli təyyarə şəbəkəsi"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Zənglər və SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi Zəngi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi‑Fi kimi operator olmayan şəbəkələr üzərindən zəng edin və qəbul edin"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi zəngi bəzi Wi‑Fi şəbəkələri kimi operator olmayan şəbəkələr üzərindən zəng etmək və qəbul etməyinizə imkan verir.\n\nSIM kartlararası zəng başqa SIM karta zəng etmək və zəng qəbul etmək üçün SIM mobil datasını istifadə etməyinizə imkan verir."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Zənglər"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d3b042f..aecf027 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1643,8 +1643,8 @@
<string name="reset_network_complete_toast" msgid="1367872474130621115">"Podešavanja mreže su resetovana"</string>
<string name="reset_esim_error_title" msgid="4670073610967959597">"Brisanje SIM kartica nije uspelo"</string>
<string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM kartice ne mogu da se obrišu zbog greške.\n\nRestartujte uređaj i probajte ponovo."</string>
- <string name="main_clear_title" msgid="277664302144837723">"Obriši sve podatke (resetovanje na Fabrička podešavanja)"</string>
- <string name="main_clear_short_title" msgid="4752094765533020696">"Obriši sve podatke (resetovanje na Fabrička podešavanja)"</string>
+ <string name="main_clear_title" msgid="277664302144837723">"Obriši sve podatke (fabrička podešavanja)"</string>
+ <string name="main_clear_short_title" msgid="4752094765533020696">"Obriši sve podatke (fabrička podešavanja)"</string>
<string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
<string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
<string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obaveštenja prema relevantnosti"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obaveštenjima"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Označite podešavanja obaveštenja i prikažite opciju za slanje povratnih informacija sistemu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetujte važnost obaveštenja"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetujte podešavanja važnosti koja je promenio korisnik i omogućite pomoćniku za obaveštenja da određuje prioritet"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikazuje predložene radnje i odgovore"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Pogledajte nedavna i odložena obaveštenja"</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je uspostavljena veza sa operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Prikaži još"</string>
<string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Želite li da uključite uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Želite li da uključite SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite li da pređete na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite li da pređete na SIM karticu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U datom trenutku može da bude aktivna samo jedna SIM kartica.\n\nPrebacivanjem na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nećete otkazati uslugu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"U datom trenutku može da bude aktivna samo jedna preuzeta SIM kartica.\n\nPrebacivanjem na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nećete otkazati uslugu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U datom trenutku može da bude aktivna samo jedna SIM kartica.\n\nPrebacivanjem nećete otkazati uslugu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Pređi na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezuje se sa mrežom…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prelazi se na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Promena mobilnog operatera nije uspela"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Promena mobilnog operatera nije uspela zbog greške."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite li da isključite uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite li da isključite SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM se isključuje<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Onemogućavanje mobilnog operatera nije uspelo"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Onemogućavanje mobilnog operatera nije uspelo"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Došlo je do greške i onemogućavanje mobilnog operatera nije uspelo."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite li da koristite 2 SIM kartice?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na ovom uređaju 2 SIM kartice mogu da budu aktivne istovremeno. Da biste nastavili da koristite samo 1 SIM karticu, dodirnite „Ne, hvala“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite li da restartujete uređaj?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Da biste započeli, restartujte uređaj. Zatim možete da dodate još jednu SIM karticu."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restartuj"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Pređi"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Aktiviranje SIM kartice nije uspelo"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Uklonite SIM karticu, pa je umetnite ponovo. Ako se problem i dalje javlja, restartujte uređaj."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probajte ponovo da uključite SIM karticu. Ako se problem i dalje javlja, restartujte uređaj."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite li da obrišete ovaj preuzeti SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Brisanjem ove SIM kartice uklonićete <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> uslugu sa ovog uređaja.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> usluga neće biti otkazana."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Obriši"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartice"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže koje su bezbedne po avion"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže koje su bezbedne po avion i povežite se na njih"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, bezbedno po avion"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje preko WiFi-ja"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Upućujte i primajte pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, WiFi-ja"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Pozivanje preko WiFi-ja vam omogućava da primate i upućujete pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, nekih WiFi mreža.\n\nPozivi preko više SIM kartica omogućavaju vam da iskoristite mobilne podatke SIM kartice da biste sa druge SIM kartice upućivali ili primali pozive."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 60c1fdc..613e758 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1104,7 +1104,7 @@
<string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Дыяпазон частот Wi-Fi"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
- <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Аўтаматычна выключыць хот-спот"</string>
+ <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Аўтаматычна выключаць хот-спот"</string>
<string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Калі няма падключаных прылад"</string>
<string name="wifi_tether_starting" msgid="8879874184033857814">"Уключэнне хот-спота..."</string>
<string name="wifi_tether_stopping" msgid="4416492968019409188">"Выключэнне хот-спота..."</string>
@@ -1814,7 +1814,7 @@
<string name="copyright_title" msgid="83245306827757857">"Аўтарскія правы"</string>
<string name="license_title" msgid="8745742085916617540">"Ліцэнзія"</string>
<string name="module_license_title" msgid="8705484239826702828">"Ліцэнзіі абнаўлення сістэмы Google Play"</string>
- <string name="terms_title" msgid="2071742973672326073">"Правілы і ўмовы"</string>
+ <string name="terms_title" msgid="2071742973672326073">"Умовы выкарыстання"</string>
<string name="webview_license_title" msgid="5832692241345780517">"Сістэмная ліцэнзія WebView"</string>
<string name="wallpaper_attributions" msgid="3080339190260272255">"Шпалеры"</string>
<string name="wallpaper_attributions_values" msgid="987277439026021925">"Спадарожнікавыя фота:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аўтаматычна ранжыраваць апавяшчэнні паводле адпаведнасці"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Водгук пра адаптыўнае апавяшчэнне"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указваць карэкціроўкі, зробленыя ў апавяшчэннях, і паказваць варыянт дадавання водгуку ў сістэму"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Скінуць налады важнасці апавяшчэнняў"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Скінуць налады важнасці, змененыя карыстальнікам, і дазволіць вызначаць прыярытэты памочніку па апавяшчэннях"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Прапанаваныя дзеянні і адказы"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аўтаматычна паказваць прапанаваныя дзеянні і адказы"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Паказаць апошнія і адкладзеныя апавяшчэнні"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недаступна праз аператара \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string>
<string name="see_more" msgid="7499355691042812723">"Яшчэ"</string>
<string name="see_less" msgid="2642392725363552793">"Паказаць менш"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Уключыць аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Уключыць SIM-карту?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Пераключыцца на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Пераключыцца на выкарыстанне SIM-карты?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нельга актываваць адначасова некалькі SIM-карт.\n\nПераключэнне на аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\" не скасуе абслугоўванне ў аператара \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нельга актываваць адначасова некалькі спампаваных SIM-карт.\n\nПераключэнне на аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\" не скасуе абслугоўванне ў аператара \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нельга актываваць адначасова некалькі SIM-карт.\n\nПераключэнне не скасуе абслугоўванне ў аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Пераключыцца на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ідзе падключэнне да сеткі…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Ідзе пераключэнне на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не ўдалося пераключыць аператара"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не ўдалося пераключыць аператара з-за памылкі."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Адключыць аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Адключыць SIM-карту?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Адключаецца SIM-карта<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не ўдалося адключыць аператара"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не ўдалося адключыць аператара"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешта пайшло не так. Не ўдалося адключыць вашага аператара."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Выкарыстоўваць 2 SIM-карты?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На гэтай прыладзе можна актываваць адначасова 2 SIM-карты. Каб і далей карыстацца толькі адной SIM-картай, націсніце \"Не, дзякуй\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Перазапусціць прыладу?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Каб пачаць, перазапусціце прыладу. Пасля гэтага можна дадаць яшчэ адну SIM-карту."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Далей"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Перазапусціць"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, дзякуй"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Пераключыцца"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не ўдалося актываваць SIM-карту"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Выдаліце SIM-карту і ўстаўце яе зноў. Калі праблема застанецца, перазапусціце прыладу."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Паспрабуйце зноў уключыць SIM-карту. Калі праблема застанецца, перазапусціце прыладу."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Сцерці даныя гэтай спампаванай SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Сціранне даных гэтай SIM-карты выдаляе з прылады магчымасць карыстацца паслугамі аператара \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\".\n\nАбслугоўванне ў аператара \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\" будзе працягнута."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Сцерці"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будзе ўключаны Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Уключана"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Выключана"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"інтэрнэт"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Сеткі, бяспечныя ў самалёце"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Шукаць сеткі, бяспечныя ў самалёце, і падключацца да іх"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самалёт, бяспека ў самалёце"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Выклікі і SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-тэлефанія"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Рабіце і атрымлівайце выклікі з выкарыстаннем сетак, якія не належаць аператарам, напрыклад Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi-тэлефанія дазваляе рабіць і прымаць выклікі праз сеткі, якія не належаць аператарам, напрыклад праз некаторыя сеткі Wi‑Fi.\n\nУ тэлефаніі паміж SIM-картамі выкарыстоўваецца мабільная перадача даных, каб з адной SIM-карты рабіць выклікі на іншую SIM-карту і прымаць іх з іншай SIM-карты."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Выклікі"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 98043c8..f8605a6 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматично класиране на известията по уместност"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзиви за адаптивните известия"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Посочва приложените към известията корекции и показва опцията за изпращане на отзиви до системата"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Нулиране на настройките за важност на известията"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Нулиране на променените от потребителя настройки за важността и разрешаване помощникът за известия да задава приоритет"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени действия и отговори"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показване на предложените действия и отговори"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Показване на скорошните и отложените известия"</string>
@@ -3577,7 +3579,7 @@
<string name="other_conversations" msgid="551178916855139870">"Разговори без приоритет"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"Разговори, в които сте направили промени"</string>
<string name="recent_conversations" msgid="471678228756995274">"Скорошни разговори"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Скорошни: Изчистване"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Изчистване на скорошни"</string>
<string name="clear" msgid="5092178335409471100">"Изчистване"</string>
<string name="important_bubble" msgid="7911698275408390846">"Показване на балонче за приоритетните разговори"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се показват най-горе в падащия панел. Можете също да зададете да се поставят в балонче и да ви прекъсват, когато използвате режима „Не безпокойте“."</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Не е налице, когато е установена връзка с(ъс) <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Вижте още"</string>
<string name="see_less" msgid="2642392725363552793">"Преглед на по-малко"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Да се включи ли <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Да се включи ли SIM картата?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Да се превключи ли към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Искате ли да превключите към използването на SIM карта?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Само една SIM карта може да бъде активна в даден момент.\n\nПревключването към <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> няма да анулира услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Само една изтеглена SIM карта може да бъде активна в даден момент.\n\nПревключването към <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> няма да анулира услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Само една SIM карта може да бъде активна в даден момент.\n\nПревключването няма да анулира услугата на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Превключване към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Установява се връзка с мрежата…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Превключва се към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не може да се превключи към друг оператор"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не може да се превключи към друг оператор поради грешка."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се изключи ли <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се изключи ли SIM картата?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картата се изключва<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Операторът не може да бъде деактивиран"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Операторът не може да бъде деактивиран"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нещо се обърка и операторът ви не бе деактивиран."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Искате ли да използвате 2 SIM карти?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На това устройство може да има 2 активни SIM карти едновременно. За да продължите да използвате само една, докоснете „Не, благодаря“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Да се рестартира ли устройството?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"За да започнете, рестартирайте устройството си. След това можете да добавите друга SIM карта."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Напред"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартиране"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, благодаря"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Превключване"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картата не може да се активира"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Премахнете SIM картата и я поставете отново. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Включете отново SIM картата. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Да се изтрие ли тази изтеглена SIM карта?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"С изтриването на тази SIM карта услугата на <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> се премахва от устройството.\n\nУслугата за <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> няма да бъде анулирана."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Изтриване на данните"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Ще се включи Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Вкл."</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Изкл."</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карти"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Мрежи, които са безопасни за използване по време на полет"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Намиране и свързване с мрежи, които са безопасни за използване по време на полет"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасно за използване по време на полет"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Обаждания и SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Обаждания през Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Извършване и получаване на обаждания през мрежи, които не са на мобилни оператори, като например Wi-Fi мрежи"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Функцията за обаждания през Wi-Fi ви дава възможност да извършвате и получавате обаждания през мрежи, които не са на мобилни оператори, като например някои Wi-Fi мрежи.\n\nФункцията за обаждания през друга SIM карта ви дава възможност да използвате мобилните данни на дадена SIM карта, за да извършвате и получавате обаждания от друга."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Обаждания"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 9d320af..9aae69d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্রাসঙ্গিকতার ভিত্তিতে অটোমেটিক র্যাঙ্কিংয়ের বিজ্ঞপ্তি"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অ্যাডাপ্টিভ বিজ্ঞপ্তির মতামত"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"বিজ্ঞপ্তি দেখানোর ক্ষেত্রে করা পরিবর্তনগুলি জানায় এবং সিস্টেমে মতামত জানানোর বিকল্প দেখায়"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"বিজ্ঞপ্তির গুরুত্ব রিসেট করুন"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ব্যবহারকারীর পরিবর্তন করা গুরুত্বপূর্ণ সেটিংস রিসেট করুন এবং সেই সঙ্গে প্রাধান্য দেওয়ার জন্য বিজ্ঞপ্তি অ্যাসিস্ট্যান্টকে অনুমতি দিন"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"সাজেস্ট করা অ্যাকশন ও উত্তর"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"সাজেস্ট করা অ্যাকশন ও উত্তর অটোমেটিক দেখানো হয়"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"সাম্প্রতিক এবং স্নুজ করা বিজ্ঞপ্তি দেখুন"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ট্যাবলেট যাচাই করতে ট্যাপ করুন"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইস যাচাই করতে ট্যাপ করুন"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ট্যাপ করুন।"</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ইমার্জেন্সি SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর ম্যানেজ করা"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"পাওয়ার বোতাম ৫ বার দ্রুত প্রেস করে জরুরি SOS অ্যাকশন চালু করুন।"</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"সতর্কতামূলক আওয়াজ"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"অ্যাকশন শুরু করার আগে সতর্কতা সম্পর্কিত বিজ্ঞপ্তি চালু করুন"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-এ কনেক্ট থাকলে উপলভ্য থাকে না"</string>
<string name="see_more" msgid="7499355691042812723">"আরও দেখুন"</string>
<string name="see_less" msgid="2642392725363552793">"কম দেখুন"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> চালু করতে চান?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"সিম চালু করবেন?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টাতে চান?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"সিম কার্ডে পাল্টাতে চান?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এ পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"যেকোনও সময় শুধুমাত্র একটি ডাউনলোড করা সিম কাজ করবে।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\nপাল্টালে <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এর পরিষেবা বাতিল করা হবে না।"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টান"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"নেটওয়ার্কে কানেক্ট করা হচ্ছে…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টানো হচ্ছে"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"পরিষেবা প্রদানকারী পাল্টানো যাচ্ছে না"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"একটি সমস্যার কারণে পরিষেবা প্রদানকারী পাল্টানো যাবে না।"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> পরিষেবা বন্ধ করতে চান?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"সিম বন্ধ করতে চান?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"সিম বন্ধ করা হচ্ছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"পরিষেবা প্রদানকারীকে বন্ধ করা যাবে না"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"পরিষেবা প্রদানকারীকে বন্ধ করা যাচ্ছে না"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কোনও সমস্যা হয়েছে এবং আপনার পরিষেবা প্রদানকারীর পরিষেবা বন্ধ করা যায়নি।"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"২টি সিম ব্যবহার করতে চান?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"এই ডিভাইসে একসাথে ২টি সিম চালু থাকতে পারে। একবারে ১টি সিম ব্যবহার করা চালিয়ে যেতে \"না থাক\" বিকল্পে ট্যাপ করুন।"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ডিভাইস রিস্টার্ট করতে চান?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"শুরু করতে, আপনার ডিভাইস রিস্টার্ট করুন। তারপরে, আপনি আরেকটি সিম যোগ করতে পারবেন।"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"চালিয়ে যান"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"রিস্টার্ট করুন"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"না থাক"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"পাল্টান"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"সিম চালু করা যাচ্ছে না"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"সিম কার্ডটি বের করে আবার ইনসার্ট করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"সিমটি আবার চালু করার চেষ্টা করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"এই ডাউনলোড করা সিম মুছে ফেলতে চান?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"এই সিম মুছে দিলে এই ডিভাইসে <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> পরিষেবা আর পাওয়া যাবে না।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> পরিষেবা কিন্তু বাতিল হবে না।"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"মুছুন"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth চালু হবে"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"চালু আছে"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"বন্ধ আছে"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ইন্টারনেট"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"সিম"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"বিমান-সুরক্ষা নেটওয়ার্ক"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"বিমান-সুরক্ষা নেটওয়ার্ক খুঁজে সেই পরিষেবাতে কানেক্ট করুন"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"বিমান, বিমান-সুরক্ষা"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"কল ও এসএমএস"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ওয়াই-ফাই কলিং"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ওয়াই-ফাই নেটওয়ার্কের মতো পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করুন এবং কল রিসিভ করুন"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ওয়াই-ফাই কলিংয়ের সাহায্যে ওয়াই-ফাই নেটওয়ার্কের মতো কিছু পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করতে এবং কল রিসিভ করতে পারবেন।\n\nক্রস-সিম কলিংয়ের সাহায্যে অন্য সিম থেকে কল করতে এবং তাতে কল রিসিভ করতে অন্য সিমের মোবাইল ডেটা ব্যবহার করতে পারবেন।"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"এসএমএস"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index c9a5acf..dab9933 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1959,7 +1959,7 @@
<string name="default_emergency_app" msgid="1929974800666613803">"Aplikacija za hitne situacije"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Vrati postavke aplikacije na zadano"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Vratiti postavke aplikacije na zadano?"</string>
- <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Na ovaj način će se vratiti sve postavke na zadano za:\n\n"<li>" Onemogućene aplikacije"</li>\n<li>"Obavještenja za onemogućene aplikacije"</li>\n<li>"Zadane aplikacije za radnje"</li>\n<li>" Ograničenje pozadinskih podataka za aplikacije"</li>\n<li>" Sva ograničenja za odobrenja"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+ <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Na ovaj način će se vratiti sve postavke na zadano za:\n\n"<li>"Onemogućene aplikacije"</li>\n<li>"Obavještenja za onemogućene aplikacije"</li>\n<li>"Zadane aplikacije za radnje"</li>\n<li>"Ograničenje pozadinskih podataka za aplikacije"</li>\n<li>"Sva ograničenja za odobrenja"</li>\n\n"Nećete izgubiti podatke iz aplikacija."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Vrati aplikacije na zadano"</string>
<string name="manage_space_text" msgid="9013414693633572277">"Upravljaj prostorom"</string>
<string name="filter" msgid="9039576690686251462">"Filter"</string>
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obavještenja prema relevantnosti"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavještenjima"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokazivanje prilagođavanja obavještenja i prikaz opcije za pružanje povratnih informacija sistemu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Poništite važnost obavještenja"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Poništite postavke o važnosti koje je promijenio korisnik i dozvolite da asistent za obavještenja određuje prioritete"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski se prikazuju predložene radnje i odgovori"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavna i odgođena obavještenja"</string>
@@ -3620,7 +3622,7 @@
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikazuju se na vrhu odjeljka za razgovor u vidu plutajućih oblačića"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Prikazuju se na vrhu odjeljka za razgovor"</string>
<string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
- <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste promijenili"</string>
+ <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste mijenjali"</string>
<string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
<string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Obriši nedavno"</string>
<string name="clear" msgid="5092178335409471100">"Obriši"</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Pogledajte više"</string>
<string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Prebaciti na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Prebaciti se na korištenje SIM kartice?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aktivan može biti samo po jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem se neće otkazati usluga mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebaci na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prebacivanje na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nije moguće zamijeniti mobilne operatere"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nije moguće zamijeniti mobilne operatere zbog greške."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nismo mogli onemogućiti operatera"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nije moguće onemogućiti mobilnog operatera"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto nije uredu i nismo mogli onemogućiti vašeg operatera."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Koristiti 2 SIM-a?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na uređaju mogu istovremeno biti 2 aktivna SIM-a. Da nastavite koristiti po 1 SIM, dodirnite \"Ne, hvala\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Ponovo pokrenuti uređaj?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Da započnete, ponovo pokrenite uređaj. Zatim možete dodati još jedan SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Ponovo pokreni"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Prebaci"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nije moguće aktivirati SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM karticu i ponovo je umetnite. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Potpuno izbrisati ovaj preuzeti SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ako potpuno izbrišete ovaj SIM, s ovog uređaja će se ukloniti usluga operatera <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nUsluga za operatera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> neće se otkazati."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Potpuno izbriši"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže sigurne za korištenje u avionu"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže sigurne za korištenje u avionu i povežite se s njima"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigurno za rad u avionu"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje putem WiFi-ja"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Uspostavljajte i primajte pozive putem mreža koje nisu od mobilnog operatera, kao što je WiFi mreža"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Pozivanje putem WiFi-ja vam omogućava da uspostavite i primate pozive putem mreža koje nisu od mobilnog operatera, kao što su neke WiFi mreže.\n\nPozivanje na različitim SIM karticama vam omogućava da koristite prijenos podataka na mobilnoj mreži jedne SIM kartice za uspostavljanje i primanje poziva sa druge SIM kartice."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 84a2fec..fbc7abc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1623,7 +1623,7 @@
<string name="reset_esim_error_title" msgid="4670073610967959597">"No es poden esborrar les targetes SIM"</string>
<string name="reset_esim_error_msg" msgid="4441504470684307370">"No s\'han pogut esborrar les targetes SIM que has baixat a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
<string name="main_clear_title" msgid="277664302144837723">"Esborra totes les dades (restabliment de fàbrica)"</string>
- <string name="main_clear_short_title" msgid="4752094765533020696">"Esborra totes les dades"</string>
+ <string name="main_clear_short_title" msgid="4752094765533020696">"Esborra totes les dades (restabliment dades fàbrica)"</string>
<string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
<string name="main_clear_desc" product="default" msgid="6984348811887162647">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
<string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
@@ -1935,7 +1935,7 @@
<string name="default_emergency_app" msgid="1929974800666613803">"Aplicació en casos d\'emergència"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Restableix les preferències d\'aplicacions"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Restablir les preferències d\'aplicacions?"</string>
- <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Es restabliran totes les preferències de:\n\n"<li>"aplicacions desactivades"</li>\n<li>"notificacions d\'aplicacions desactivades"</li>\n<li>"aplicacions predeterminades per a les accions"</li>\n<li>"restriccions de dades en segon pla per a les aplicacions"</li>\n<li>"restriccions de permisos"</li>\n\n"No perdràs les dades de les aplicacions."</string>
+ <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Es restabliran totes les preferències de:\n\n"<li>"Aplicacions desactivades"</li>\n<li>"Notificacions d\'aplicacions desactivades"</li>\n<li>"Aplicacions predeterminades per a les accions"</li>\n<li>"Restriccions de dades en segon pla per a les aplicacions"</li>\n<li>"Restriccions de permisos"</li>\n\n"No perdràs les dades de les aplicacions."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Restableix aplicacions"</string>
<string name="manage_space_text" msgid="9013414693633572277">"Gestiona l\'espai"</string>
<string name="filter" msgid="9039576690686251462">"Filtra"</string>
@@ -2447,7 +2447,7 @@
<string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Millora la durada de la bateria de la tauleta"</string>
<string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Millora la durada de la bateria del dispositiu"</string>
<string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Activa el gestor de bateria"</string>
- <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Activa l\'estalvi de bateria"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Activa la funció Estalvi de bateria"</string>
<string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Pot ser que la bateria s\'esgoti massa ràpid"</string>
<string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"S\'ha activat l\'estalvi de bateria"</string>
<string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"És possible que algunes funcions estiguin limitades"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifica automàticament les notificacions per ordre de rellevància"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Suggeriments sobre les notificacions adaptatives"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica els ajustos que s\'han fet a les notificacions i mostra l\'opció per enviar suggeriments al sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restableix la importància de les notificacions"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restableix la configuració d\'importància que l\'usuari ha canviat i permet que es prioritzi l\'assistent de notificació"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accions i respostes suggerides"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automàticament les accions i respostes suggerides"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostra les notificacions recents i posposades"</string>
@@ -3577,7 +3579,7 @@
<string name="other_conversations" msgid="551178916855139870">"Converses no prioritàries"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"Converses en què has fet canvis"</string>
<string name="recent_conversations" msgid="471678228756995274">"Converses recents"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Esborra les recents"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Esborra recents"</string>
<string name="clear" msgid="5092178335409471100">"Esborra"</string>
<string name="important_bubble" msgid="7911698275408390846">"Mostra les converses prioritàries com a bombolles"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les converses prioritàries es mostren a la part superior de l\'àrea desplegable. També pots definir que es mostrin com a bombolles i interrompin el mode No molestis."</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No està disponible quan està connectat a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Mostra\'n més"</string>
<string name="see_less" msgid="2642392725363552793">"Mostra\'n menys"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vols activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vols activar la SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vols canviar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vols utilitzar la targeta SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Només pot haver-hi una SIM activa.\n\nSi canvies a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, el teu servei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> no es cancel·larà."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Només pot haver-hi una SIM baixada activa.\n\nSi canvies a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, el teu servei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> no es cancel·larà."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Només pot haver-hi una SIM activa.\n\nSi canvies de SIM, el teu servei <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> no es cancel·larà."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Canvia a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"S\'està connectant a la xarxa…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"S\'està canviant a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No es pot canviar d\'operador"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"S\'ha produït un error i no es pot canviar d\'operador."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vols desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vols desactivar la SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"S\'està desactivant la SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No es pot desactivar l\'operador"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No es pot desactivar l\'operador"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"S\'ha produït un error i no s\'ha pogut desactivar l\'operador."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vols utilitzar 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Aquest dispositiu pot tenir 2 SIM actives alhora. Per continuar utilitzant només 1 SIM, toca \"No, gràcies\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vols reiniciar el dispositiu?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Per començar, reinicia el dispositiu. A continuació, pots afegir una altra SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continua"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reinicia"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gràcies"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Canvia"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No s\'ha pogut activar la SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Treu la SIM i torna-la a inserir. Si el problema continua, reinicia el dispositiu."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prova de tornar a activar la SIM. Si el problema continua, reinicia el dispositiu."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vols esborrar la SIM que has baixat?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Si esborres aquesta targeta SIM, el servei <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> se suprimirà del dispositiu.\n\nEl servei <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> no es cancel·larà."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Esborra"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"S\'activarà el Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activat"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivat"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Targetes SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Xarxes segures per al mode d\'avió"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cerca xarxes segures per al mode d\'avió i connecta-t\'hi"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"mode d\'avió, segur per al mode d\'avió"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Trucades i SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Trucades per Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Fes i rep trucades per xarxes sense operador, com ara una Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"La funció Trucades per Wi‑Fi et permet fer i rebre trucades per xarxes sense operador, com ara algunes xarxes Wi‑Fi.\n\nLes trucades amb targetes SIM combinades et permeten aprofitar les dades mòbils d\'una SIM per fer i rebre trucades des d\'una altra SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Trucades"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e2eb581..c8e148e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky oznámení hodnotit podle relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Zpětná vazba k adaptivnímu oznámení"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uvádět, jaké úpravy byly u oznámení provedeny, a ukazovat možnost poskytnout systému zpětnou vazbu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetovat důležitost oznámení"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetovat nastavení důležitosti změněná uživatelem a povolit stanovení priority pomocí asistenta oznámení"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akce a odpovědi"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovat navrhované akce a odpovědi"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Zobrazit nedávná a odložená oznámení"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Při připojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g> nedostupné"</string>
<string name="see_more" msgid="7499355691042812723">"Zobrazit další"</string>
<string name="see_less" msgid="2642392725363552793">"Zobrazit méně"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Zapnout operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Zapnout SIM kartu?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Přepnout na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Přepnout na SIM kartu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"V jednu chvíli může být aktivní pouze jedna SIM karta.\n\nPřepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"V jednu chvíli může být aktivní pouze jedna stažená SIM karta.\n\nPřepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednu chvíli může být aktivní pouze jedna SIM karta.\n\nPřepnutím nezrušíte službu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Přepnout na síť <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Připojování k síti…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Přepínání na síť <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operátora nelze přepnout"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operátora kvůli chybě nelze přepnout."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vypnout operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vypnout SIM kartu?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypínání SIM karty<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operátora nelze deaktivovat"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operátora nelze deaktivovat"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Něco se pokazilo a deaktivace operátora se nezdařila."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Používat dvě SIM karty?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zařízení lze používat dvě SIM karty současně. Chcete-li používat jen jednu, klepněte na „Ne, díky“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restartovat zařízení?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Nejprve restartujte zařízení. Poté budete moci přidat druhou SIM kartu."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Pokračovat"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restartovat"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, díky"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Přepnout"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu nelze aktivovat"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyjměte SIM kartu a znovu ji vložte. Pokud problém přetrvává, restartujte zařízení."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zkuste SIM kartu znovu zapnout. Pokud problém přetrvává, restartujte zařízení."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vymazat staženou SIM kartu?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Když vymažete tuto SIM kartu, ze zařízení bude odebrán operátor <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nSlužba operátora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> zrušena nebude."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vymazat"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne se Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Zapnuto"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuto"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Sítě bezpečné v letadle"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Najděte sítě bezpečné v letadle a připojte se k nim"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letadlo, bezpečné v letadle"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Volání a SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Volání přes Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Uskutečňujte a přijímejte hovory přes sítě nespravované operátory, např. přes Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Volání přes Wi-Fi umožňuje uskutečňovat a přijímat hovory ze sítí nespravované operátory, jako jsou některé sítě Wi-Fi.\n\nVolání napříč SIM kartami také umožňuje uskutečňovat a přijímat hovory s využitím mobilních dat z jiné SIM karty."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Volání"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 75e93b3..d9f41dd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger automatisk notifikationer efter relevans"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om tilpassede notifikationer"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer af notifikationer, og vis en mulighed for at give feedback til systemet"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Nulstil vigtigheden af notifikationer"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Nulstil brugerangivne indstillinger for vigtighed, og tillad, at notifikationsassistenten prioriterer."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåede handlinger og svar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis automatisk foreslåede handlinger og svar"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Vis seneste notifikationer og notifikationer, der er udsat"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Se mere"</string>
<string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vil du aktivere <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vil du aktivere SIM-kortet?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vil du skifte til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vil du skifte til at bruge SIM-kort?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Der kan kun være ét downloadet SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter SIM-kort, opsiges dit abonnement hos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ikke."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skift til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Opretter forbindelse til netværket…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skifter til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Det lykkedes ikke at skifte mobilselskab"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Det lykkedes ikke at skifte mobilselskab på grund af en fejl."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du deaktivere <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du deaktivere SIM-kortet?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Deaktiverer SIM-kort<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilselskabet kan ikke deaktiveres"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Mobilselskabet kunne ikke deaktiveres"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noget gik galt, og dit mobilselskab kunne ikke deaktiveres."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vil du bruge to SIM-kort?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Denne enhed kan have to aktive SIM-kort på samme tid. Hvis du vil fortsætte med kun at bruge 1 SIM-kort ad gangen, kan du trykke på \"Nej tak\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vil du genstarte enheden?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Genstart din enhed for at komme i gang. Derefter kan du tilføje et andet SIM-kort."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Fortsæt"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Genstart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tak"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Skift"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kortet kunne ikke aktiveres"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Tag SIM-kortet ud, og sæt det i igen. Genstart enheden, hvis problemet fortsætter."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv at aktivere SIM-kortet igen. Genstart enheden, hvis problemet fortsætter."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vil du rydde dette downloadede SIM-kort?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Hvis du rydder dette SIM-kort, fjernes tjenesten fra <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> på denne enhed.\n\nTjenesten fra <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> opsiges ikke."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ryd"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveres"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Til"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Fra"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Netværk til brug i fly"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find og opret forbindelse til netværk, der kan bruges under flyrejsen"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, sikkert netværk i fly"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Opkald og sms-beskeder"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-opkald"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Foretag og modtag opkald via netværk, der ikke er mobilnetværk, f.eks. Wi-Fi-netværk"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Med Wi-Fi-opkald kan du foretage og modtage opkald via netværk, der ikke er mobilnetværk, som f.eks. Wi‑Fi-netværk.\n\nMed funktionen til opkald på tværs af SIM-kort kan du anvende mobildataene på ét SIM-kort til at foretage og modtage opkald via et andet SIM-kort."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Opkald"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6ef9234..c3fa048 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3478,6 +3478,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Benachrichtigungen automatisch nach Relevanz sortieren"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback zu adaptiven Benachrichtigungen"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Änderungen an Benachrichtigungen und die Option für Systemfeedback anzeigen"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Wichtigkeit von Benachrichtigungen zurücksetzen"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Vom Nutzer geänderte Wichtigkeitseinstellungen zurücksetzen und dem Benachrichtigungsassistenten eine Priorisierung erlauben"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Aktions- und Antwortvorschläge"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Es werden automatisch Vorschläge für Aktionen und Antworten angezeigt"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Neue und zurückgestellte Benachrichtigungen anzeigen"</string>
@@ -4499,16 +4501,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Beim Tippen Display aktivieren"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Beim Tippen Display aktivieren"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Wenn du auf den Bildschirm tippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Notfall"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Verwaltet von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Drücke fünfmal schnell die Ein-/Aus-Taste, um die Aktionen für Notfälle zu starten."</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Warnton"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Warnung vor Beginn der Aktionen"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fingerabdrucksensor verwenden"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Zum Lesen von Benachrichtigungen von oben nach unten über den Fingerabdrucksensor auf der Rückseite des Smartphones wischen"</string>
@@ -4851,11 +4848,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
<string name="see_more" msgid="7499355691042812723">"Mehr anzeigen"</string>
<string name="see_less" msgid="2642392725363552793">"Weniger anzeigen"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivieren?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktivieren?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-Karte wechseln?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Es kann immer nur eine heruntergeladene eSIM aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zwischen ihnen wechselst, wird dein <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-Dienst nicht beendet."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbindung zum Mobilfunknetz wird hergestellt…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Wechsel zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Mobilfunkanbieter kann nicht gewechselt werden"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Der Mobilfunkanbieter kann aufgrund eines Fehlers nicht gewechselt werden."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktivieren?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktivieren?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM wird deaktiviert<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilfunkanbieter kann nicht deaktiviert werden"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Mobilfunkanbieter kann nicht deaktiviert werden"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ein Problem ist aufgetreten. Dein Mobilfunkanbieter konnte nicht deaktiviert werden."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Zwei SIM-Karten verwenden?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Auf diesem Gerät können zwei SIM-Karten gleichzeitig aktiv sein. Wenn du weiterhin nur eine SIM-Karte verwenden möchtest, tippe auf „Nein danke“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Gerät neu starten?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Starte zuerst dein Gerät neu. Danach kannst du eine weitere SIM-Karte hinzufügen."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Weiter"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Neu starten"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nein danke"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Wechseln"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kann nicht aktiviert werden"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Versuche, die SIM noch einmal zu aktivieren. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Diese heruntergeladene SIM löschen?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Wenn du diese SIM löschst, wird der <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-Dienst von diesem Gerät entfernt.\n\nDer Mobilfunkvertrag bei <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> wird dadurch nicht gekündigt."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Löschen"</string>
@@ -4994,4 +5014,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wird aktiviert"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"An"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Aus"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-Karten"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Flugsichere Netzwerke"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Flugsichere Netzwerke finden und Verbindung herstellen"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"Flug, Flugzeug, flugsicher"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Anrufe & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN-Anrufe"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen wie über ein WLAN"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Mit WLAN-Telefonie kannst du Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen, wie etwa über einige WLAN-Netzwerke.\n\nBei Anrufen über ein Netzwerk von SIM-Karten nutzt du die mobilen Daten einer SIM-Karte, um Anrufe einer anderen SIM-Karte auszuführen und zu empfangen."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Anrufe"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d6f2392..ef21c84 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1935,7 +1935,7 @@
<string name="default_emergency_app" msgid="1929974800666613803">"Εφαρμογή έκτακτης ανάγκης"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Επαναφορά προτιμήσεων εφαρμογών"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Επαναφ. προτιμ. εφαρμ;"</string>
- <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Με αυτήν την ενέργεια, θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"Απενεργοποιημένες εφαρμογές"</li>\n<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n<li>"Περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n<li>"Τυχόν περιορισμούς αδειών"</li>\n\n"Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
+ <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Με αυτήν την ενέργεια, θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"απενεργοποιημένες εφαρμογές"</li>\n<li>"απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n<li>"προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n<li>"περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n<li>"τυχόν περιορισμούς αδειών"</li>\n\n"Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Επαναφορά εφαρμογών"</string>
<string name="manage_space_text" msgid="9013414693633572277">"Διαχείριση χώρου"</string>
<string name="filter" msgid="9039576690686251462">"Φίλτρο"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Αυτόματη ταξινόμηση ειδοποιήσεων κατά συνάφεια"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Σχόλια προσαρμοστικών ειδοποιήσεων"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Να υποδεικνύονται προσαρμογές που πραγματοποιούνται σε ειδοποιήσεις και να εμφανίζεται η επιλογή παροχής σχολίων στο σύστημα."</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Επαναφορά σημασίας ειδοποίησης"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Επαναφέρετε τις ρυθμίσεις σημασίας που άλλαξαν από τον χρήστη και επιτρέψτε στον βοηθό ειδοποιήσεων να ορίζει την προτεραιότητα."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Προτεινόμενες ενέργειες και απαντήσεις"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Αυτόματη εμφάνιση προτεινόμενων ενεργειών και απαντήσεων"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Εμφάνιση πρόσφατων ειδοποιήσεων και ειδοποιήσεων που έχουν αναβληθεί"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Δεν διατίθεται κατά τη σύνδεση σε <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Δείτε περισσότερα"</string>
<string name="see_less" msgid="2642392725363552793">"Εμφάνιση λιγότερων"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ενεργοποίηση <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ενεργοποίηση κάρτας SIM;"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Εναλλαγή στη χρήση κάρτας SIM;"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Μόνο μία SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή στο δίκτυο <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> δεν θα ακυρώσει την υπηρεσία <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Μόνο μία ληφθείσα SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή στο δίκτυο <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> δεν θα ακυρώσει την υπηρεσία <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Μόνο μία SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή δεν θα ακυρώσει την υπηρεσία <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Σύνδεση στο δίκτυο…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Δεν είναι δυνατή η εναλλαγή εταιρείας κινητής τηλεφωνίας"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Δεν είναι δυνατή η εναλλαγή εταιρείας κινητής τηλεφωνίας λόγω ενός σφάλματος."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Απενεργοποίηση <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Απενεργοποίηση SIM;"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Απενεργοποίηση SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Δεν είναι δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Δεν είναι δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Παρουσιάστηκε κάποιο πρόβλημα και δεν ήταν δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας σας."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Χρήση 2 SIM;"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Αυτή η συσκευή μπορεί να έχει 2 ενεργές SIM ταυτόχρονα. Για να συνεχίσετε χρησιμοποιώντας 1 SIM τη φορά, πατήστε Όχι, ευχαριστώ."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Επανεκκίνηση συσκευής;"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Για να ξεκινήσετε, επανεκκινήστε τη συσκευή σας. Στη συνέχεια, μπορείτε να προσθέσετε μια άλλη SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Συνέχεια"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Επανεκκίνηση"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Όχι, ευχαριστώ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Εναλλαγή"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Δεν είναι δυνατή η ενεργοποίηση της SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Αφαιρέστε τη SIM και τοποθετήστε τη ξανά. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Δοκιμάστε να ενεργοποιήσετε ξανά τη SIM. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Διαγραφή αυτής της SIM της οποίας έγινε λήψη;"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Η διαγραφή αυτής της SIM καταργεί την υπηρεσία <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> από αυτήν τη συσκευή.\n\nΗ υπηρεσία για <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> δεν θα ακυρωθεί."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Διαγραφή"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Το Bluetooth θα ενεργοποιηθεί."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Ενεργή"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Ανενεργή"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Διαδίκτυο"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Κάρτες SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Ασφαλή δίκτυα πτήσης"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Βρείτε και συνδεθείτε σε ασφαλή δίκτυα πτήσης"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"πτήση, ασφαλή για την πτήση"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Κλήσεις και SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Κλήση Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Πραγματοποίηση και λήψη κλήσεων μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως Wi‑Fi."</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Η Κλήση Wi-Fi σας επιτρέπει να πραγματοποιήσετε και να λάβετε κλήσεις μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως ορισμένα δίκτυα Wi‑Fi.\n\nΗ κλήση με πολλές SIM σας επιτρέπει να αξιοποιήσετε τα δεδομένα κινητής τηλεφωνίας μιας SIM για να πραγματοποιείτε και να λαμβάνετε κλήσεις από άλλη SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Κλήσεις"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 95f99ad..bc5caf8 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"See more"</string>
<string name="see_less" msgid="2642392725363552793">"See less"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-operator networks like Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi calling allows you to make and receive calls over non-operator networks such as some Wi‑Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0439fa1..d4d3eba 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"See more"</string>
<string name="see_less" msgid="2642392725363552793">"See less"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-operator networks like Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi calling allows you to make and receive calls over non-operator networks such as some Wi‑Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 57d56ea..1c5bdbe 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"See more"</string>
<string name="see_less" msgid="2642392725363552793">"See less"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-operator networks like Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi calling allows you to make and receive calls over non-operator networks such as some Wi‑Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 64a22b1..ef8fdd5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"See more"</string>
<string name="see_less" msgid="2642392725363552793">"See less"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-operator networks like Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi calling allows you to make and receive calls over non-operator networks such as some Wi‑Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 59022b9..de83776 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user changed importance settings and allow notification assistant to prioritize"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions & replies"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"See more"</string>
<string name="see_less" msgid="2642392725363552793">"See less"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch carrier"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The carrier can’t be switched due to an error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable carrier"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable carrier"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your carrier could not be disabled."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use 2 SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No thanks"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be canceled."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Airplane-safe networks"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to airplane‑safe networks"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"airplane, airplane-safe"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Calls & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi Calling"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-carrier networks like Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi calling allows you to make and receive calls over non-carrier networks such as some Wi‑Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6645df4..fb5cb82 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones automáticamente por relevancia"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptables"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes realizados a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablece la prioridad de notificaciones"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restablece la configuración de importancia cambiada por el usuario y permite que el asistente de notificaciones establezca las prioridades"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respuestas y acciones sugeridas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automáticamente respuestas y acciones sugeridas"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Visualiza notificaciones recientes y pospuestas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando estás conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ver más"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Quieres activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Quieres activar la SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"¿Quieres cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Cambiar a uso de tarjeta SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Solo se puede activar una tarjeta SIM a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará el servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Solo puede activarse una tarjeta SIM descargada a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará el servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo se puede activar una tarjeta SIM a la vez.\n\nSi cambias, no se cancelará el servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Estableciendo conexión con la red…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No se puede cambiar de proveedor"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"No se puede cambiar de proveedor debido a un error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Quieres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Quieres desactivar la tarjeta SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No se puede inhabilitar el proveedor"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No se puede inhabilitar el proveedor"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se produjo un error y no se pudo inhabilitar tu proveedor."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"¿Quieres usar 2 tarjetas SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo puede tener 2 tarjetas SIM activas al mismo tiempo. Para seguir usando una sola, presiona \"No, gracias\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"¿Quieres reiniciar el dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para comenzar, reinicia el dispositivo. Luego, podrás agregar otra tarjeta SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se puede activar la SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita la SIM y vuelve a insertarla. Si el problema persiste, reinicia el dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Vuelve a activar la SIM. Si el problema persiste, reinicia el dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"¿Quieres borrar esta tarjeta SIM descargada?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Si borras esta tarjeta SIM, se quitará el servicio de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de este dispositivo.\n\nSin embargo, no se cancelará el servicio de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activado"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviones"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca y conéctate a redes seguras para aviones"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para aviones"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Hacer y recibir llamadas a través de redes que no pertenecen a ningún proveedor, como Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"La función Llamada por Wi-Fi te permite hacer y recibir llamadas mediante redes que no pertenecen a ningún proveedor, como algunas redes Wi-Fi.\n\nLas llamadas entre tarjetas SIM te permiten aprovechar los datos móviles de una SIM para hacer y recibir llamadas de otra SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 024817f..dc13617 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1622,8 +1622,8 @@
<string name="reset_network_complete_toast" msgid="1367872474130621115">"Se han recuperado los ajustes de red"</string>
<string name="reset_esim_error_title" msgid="4670073610967959597">"No se pueden borrar las SIM"</string>
<string name="reset_esim_error_msg" msgid="4441504470684307370">"No se pueden eliminar las SIM descargadas debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
- <string name="main_clear_title" msgid="277664302144837723">"Borrar todos los datos"</string>
- <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todos los datos"</string>
+ <string name="main_clear_title" msgid="277664302144837723">"Volver al estado de fábrica (borrar todo)"</string>
+ <string name="main_clear_short_title" msgid="4752094765533020696">"Volver al estado de fábrica (borrar todo)"</string>
<string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
<string name="main_clear_desc" product="default" msgid="6984348811887162647">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
<string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Has iniciado sesión en estas cuentas:\n"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones por importancia automáticamente"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptativas"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes hechos a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablecer la importancia de las notificaciones"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Revierte los cambios en los ajustes de la importancia del usuario y permite que se priorice el asistente de notificaciones"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acciones y respuestas sugeridas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Muestra automáticamente las acciones y las respuestas sugeridas"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificaciones recientes y pospuestas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando se está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ver más"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Activar tarjeta SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"¿Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Pasar a usar tarjeta SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Solo puede haber una tarjeta SIM descargada activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias, no se cancelará tu servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectándose a la red…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No se ha podido cambiar de operador"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"No se ha podido cambiar de operador debido a un error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Desactivar tarjeta SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando tarjeta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No se ha podido inhabilitar el operador"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No se ha podido inhabilitar el operador"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se ha producido un error y no se ha podido inhabilitar tu operador."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"¿Usar 2 tarjetas SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo puede tener 2 tarjetas SIM activas a la vez. Para seguir usando solo una, toca No, gracias."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"¿Reiniciar el dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para empezar, reinicia tu dispositivo. A continuación, podrás añadir otra tarjeta SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se ha podido activar la tarjeta SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Extrae la tarjeta SIM e insértala de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prueba a activar la tarjeta SIM de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"¿Borrar esta SIM descargada?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Si borras esta SIM, el servicio de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> dejará de estar disponible en este dispositivo.\n\nNo se cancelará el servicio de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activado"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para modo avión"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca y conéctate a redes seguras para modo avión"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"modo avión, seguro para modo avión"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Llamar o recibir llamadas de redes que no pertenecen a ningún operador, como las redes Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Llamada por Wi-Fi le permite llamar y recibir llamadas por redes que no pertenecen a ningún operador, como algunas redes Wi‑Fi.\n\nLas llamadas entre SIM distintas le permiten aprovechar los datos móviles de una tarjeta SIM para llamar y recibir llamadas de otra SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 3fe0bb1..710e166 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1623,7 +1623,7 @@
<string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kaarte ei saa kustutada"</string>
<string name="reset_esim_error_msg" msgid="4441504470684307370">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
<string name="main_clear_title" msgid="277664302144837723">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
- <string name="main_clear_short_title" msgid="4752094765533020696">"Kust. andmed (tehases. läht.)"</string>
+ <string name="main_clear_short_title" msgid="4752094765533020696">"Kõigi andmete kustutamine (tehaseseaded)"</string>
<string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
<string name="main_clear_desc" product="default" msgid="6984348811887162647">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
<string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
@@ -1933,7 +1933,7 @@
<string name="show_running_services" msgid="8666008279959853318">"Kuva töötavad teenused"</string>
<string name="show_background_processes" msgid="5682856012453562151">"Kuva vahemällu salvestatud protsessid"</string>
<string name="default_emergency_app" msgid="1929974800666613803">"Hädaabirakendus"</string>
- <string name="reset_app_preferences" msgid="8861758340732716573">"Lähtesta rakenduste eelistused"</string>
+ <string name="reset_app_preferences" msgid="8861758340732716573">"Rakenduste eelistuste lähtestamine"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Lähtestada rakenduste eelistused?"</string>
<string name="reset_app_preferences_desc" msgid="6509978724602405805">"See lähtestab kõik järgmised eelistused.\n\n"<li>"Keelatud rakendused"</li>\n<li>"Keelatud rakenduste märguanded"</li>\n<li>"Toimingute vaikerakendused"</li>\n<li>"Rakenduste taustaandmete piirangud"</li>\n<li>"Mis tahes lubade piirangud"</li>\n\n"Rakenduste andmed säilivad."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Lähtesta rakendused"</string>
@@ -1975,7 +1975,7 @@
<string name="system_package" msgid="7559476279008519360">"Süsteemivärskendusi ei saa installida välisele kandjale."</string>
<string name="move_error_device_admin" msgid="1561502976834303626">"Seadme administraatori rakendust ei saa installida välisele andmekandjale"</string>
<string name="force_stop_dlg_title" msgid="86745852555490146">"Kas peatada sunniviisiliselt?"</string>
- <string name="force_stop_dlg_text" msgid="1527286468544457368">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
+ <string name="force_stop_dlg_text" msgid="1527286468544457368">"Kui sunnite rakenduse peatuma, võib see toimida valesti."</string>
<string name="app_install_location_title" msgid="8932938164156303191">"Eelistatud installiasukoht"</string>
<string name="app_install_location_summary" msgid="4948270795544357021">"Muutke uute rakenduste eelistatud installiasukohta"</string>
<string name="app_disable_dlg_positive" msgid="1414218905322009505">"Keela rakendus"</string>
@@ -2408,7 +2408,7 @@
<string name="background_activity_summary_disabled" msgid="32459916080651444">"Rakendusel ei ole lubatud taustal töötada"</string>
<string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Taustal kasutamist ei saa piirata"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Kas piirata taustal tegevust?"</string>
- <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
+ <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus toimida valesti."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
<string name="device_screen_usage" msgid="1011630249648289909">"Ekraani kasutus alates täislaadimisest"</string>
<string name="power_usage_list_summary" msgid="3237540201918492925">"Akukasutus alates täislaadimisest"</string>
@@ -3207,7 +3207,7 @@
<item quantity="other">Kuva %d peidetud üksust</item>
<item quantity="one">Kuva %d peidetud üksus</item>
</plurals>
- <string name="network_dashboard_title" msgid="788543070557731240">"Võrk ja Internet"</string>
+ <string name="network_dashboard_title" msgid="788543070557731240">"Võrk ja internet"</string>
<string name="network_dashboard_summary_mobile" msgid="4020746665765996480">"mobiilivõrk"</string>
<string name="network_dashboard_summary_data_usage" msgid="2531133412846140766">"andmeside kasutus"</string>
<string name="network_dashboard_summary_hotspot" msgid="3798394197274240682">"kuumkoht"</string>
@@ -3234,7 +3234,7 @@
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"WiFi märguanne, wifi märguanne"</string>
<string name="keywords_wifi_data_usage" msgid="4718555409695862085">"andmekasutus"</string>
<string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"Vibreerimise peatamine, puudutus, klaviatuur"</string>
- <string name="keywords_time_format" msgid="5384803098766166820">"Kasuta 24-tunnist vormingut"</string>
+ <string name="keywords_time_format" msgid="5384803098766166820">"Kasuta 24-tunni vormingut"</string>
<string name="keywords_storage_files" msgid="4509695858659705198">"Allalaadimine"</string>
<string name="keywords_app_default" msgid="8977706259156428770">"Ava rakendusega"</string>
<string name="keywords_applications_settings" msgid="999926810912037792">"Rakendused"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjesta märguanded automaatselt asjakohasuse järgi"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Kohanduvate märguannete tagasiside"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näitab, kuidas on märguandeid kohandatud. Samuti näitab valikut süsteemile tagasiside andmiseks."</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Märguande olulisuse lähtestamine"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Kasutaja muudetud olulisuse seadete lähtestamine ja märguannete assistendil prioriseerimise lubamine"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Soovitatud toimingud ja vastused"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Kuva soovitatud toimingud ja vastused automaatselt"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Kuva hiljutisi ja edasilükatud märguandeid"</string>
@@ -3576,7 +3578,7 @@
<string name="important_conversations_summary" msgid="3184022761562676418">"Kuva vestluste jaotise kohal"</string>
<string name="other_conversations" msgid="551178916855139870">"Vähemtähtsad vestlused"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"Vestlused, milles olete muudatusi teinud"</string>
- <string name="recent_conversations" msgid="471678228756995274">"Hiljutised meilivestlused"</string>
+ <string name="recent_conversations" msgid="471678228756995274">"Hiljutised vestlused"</string>
<string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Kustuta hiljutised"</string>
<string name="clear" msgid="5092178335409471100">"Kustuta"</string>
<string name="important_bubble" msgid="7911698275408390846">"Kuva prioriteetsed vestlused mullis"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Pole saadaval, kui on ühendus on loodud operaatoriga <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Kuva rohkem"</string>
<string name="see_less" msgid="2642392725363552793">"Kuva vähem"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Kas lülitada operaator <xliff:g id="CARRIER_NAME">%1$s</xliff:g> sisse?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Kas lülitada SIM-kaart sisse?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Kas soovite aktiveerida operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Kas aktiveerida SIM-kaardi kasutamine?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Korraga saab aktiivne olla vaid üks SIM-kaart.\n\nOperaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aktiveerimisel ei tühistata operaatori <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> teenust."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Korraga saab aktiivne olla vaid üks allalaaditud SIM-kaart.\n\nOperaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aktiveerimisel ei tühistata operaatori <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> teenust."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Korraga saab aktiivne olla vaid üks SIM-kaart.\n\nAktiveerimine ei tühista operaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> teenust."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Aktiveeri operaator <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Võrguga ühendamine …"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktiveerimine"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaatorit ei saa vahetada"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaatorit ei saa vea tõttu vahetada."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kas lülitada <xliff:g id="CARRIER_NAME">%1$s</xliff:g> välja?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kas lülitada SIM-kaart välja?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kaardi väljalülitamine <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaatorit ei saa keelata"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaatorit ei saa keelata"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Midagi läks valesti ja teie operaatorit ei saanud keelata."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Kas kasutada kahte SIM-kaarti?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Selles seadmes saavad korraga aktiivsed olla kaks SIM-kaarti. Korraga ühe SIM-kaardi kasutamise jätkamiseks puudutage valikut „Tänan, ei”."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Kas soovite seadme taaskäivitada?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Alustamiseks taaskäivitage oma seade. Seejärel lisage veel üks SIM-kaart."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Jätka"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Taaskäivita"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Tänan, ei"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Vaheta"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kaarti ei saa aktiveerida"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Eemaldage SIM-kaart ja sisestage uuesti. Kui probleem jätkub, taaskäivitage seade."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Lülitage SIM-kaart uuesti sisse. Kui probleem jätkub, taaskäivitage seade."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Kas soovite allalaaditud SIM-kaardi kustutada?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"SIM-kaardi kustutamisel eemaldatakse seadmest operaatori <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> teenus.\n\nOperaatori <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> teenust ei tühistata."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Kustuta"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth lülitub sisse"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Sees"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Väljas"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kaardid"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Lennukikindlad võrgud"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Lennukikindlate võrkude leidmine ja nendega ühenduse loomine"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lennuk, lennukikindel"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Kõned ja SMS-id"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"WiFi-kõned"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Helistamine ja kõnede vastuvõtmine operaatoriväliste võrkude kaudu (nt WiFi-võrgud)"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"WiFi-kõned võimaldavad teil helistada ja kõnesid vastu võtta operaatoriväliste võrkude kaudu (nt mõned WiFi-võrgud).\n\nSIM-kaardi ülene helistamine võimaldab teil teise SIM-kaardi kaudu helistamiseks ja kõnede vastuvõtmiseks kasutada SIM-kaardi mobiilset andmesidet."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Kõned"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 01c3930..89c92a8 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Sailkatu jakinarazpenak automatikoki garrantziaren arabera"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Jakinarazpen doigarriei buruzko iritzia"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Adierazi jakinarazpenetan egindako doikuntzak eta erakutsi sistemara iritzia bidaltzeko aukera"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Berrezarri jakinarazpenen garrantzia"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Berrezarri erabiltzaileak aldatutako garrantzi-ezarpenak eta eman lehentasunak ezartzeko baimena jakinarazpenen laguntzaileari"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ekintza eta erantzun iradokiak"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Erakutsi automatikoki ekintza eta erantzun iradokiak"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Erakutsi azken jakinarazpenak eta atzeratutakoak"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
<string name="see_more" msgid="7499355691042812723">"Ikusi gehiago"</string>
<string name="see_less" msgid="2642392725363552793">"Ikusi gutxiago"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktibatu nahi duzu?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM txartela aktibatu nahi duzu?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatu nahi duzu?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM txartela erabiltzen hasi nahi duzu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM txartel bakarra aktiba daiteke aldiko.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operadorera aldatuta ere ez da bertan behera utziko <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> zerbitzua."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Deskargatutako SIM txartel bakarra aktiba daiteke aldiko.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operadorera aldatuta ere ez da bertan behera utziko <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> zerbitzua."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM txartel bakarra aktiba daiteke aldiko.\n\n Aldatuta ere, ez da utziko bertan behera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> zerbitzua."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Aldatu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Sarera konektatzen…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatzen"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ezin da aldatu operadorea"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Errore bat gertatu da eta ezin da aldatu operadorea."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> desaktibatu nahi duzu?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM txartela desaktibatu nahi duzu?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM txartela desaktibatzen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ezin da desgaitu operadorea"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ezin da desgaitu operadorea"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazoren bat izan da, eta ezin izan da desgaitu operadorea."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Bi SIM txartel erabili nahi dituzu?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Gailu honek bi SIM txartel izan ditzake aktibo aldi berean. SIM txartel bakarra erabili nahi baduzu, sakatu \"Ez, eskerrik asko\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Gailua berrabiarazi nahi duzu?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Hasteko, berrabiarazi gailua. Gero, beste SIM txartel bat gehitu ahalko duzu."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Egin aurrera"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Berrabiarazi"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ez"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Aldatu"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ezin da aktibatu SIM txartela"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Saiatu berriro SIM txartela aktibatzen. Arazoak badirau, berrabiarazi gailua."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Deskargatutako SIM txartel honetako eduki guztia ezabatu?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"SIM txartel honetako eduki guztia ezabatuz gero, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> operadorearen zerbitzua kenduko da gailu honetatik.\n\nEz da utziko bertan behera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> operadorearen zerbitzua."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ezabatu eduki guztia"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth bidezko konexioa aktibatuko da"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktibatuta"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desaktibatuta"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM txartelak"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Hegaldietarako seguruak diren sareak"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Aurkitu hegaldietarako seguruak diren sareak eta konektatu haietara"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"hegaldia, hegaldietarako segurua"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Deiak eta SMSak"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi bidezko deiak"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Egin eta jaso deiak wifia eta operadore batenak ez diren antzeko sareen bitartez"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wifi bidezko deiekin, deiak egin eta jaso ahalko dituzu operadore batenak ez diren sareen bitartez (adibidez, zenbait wifi-sare).\n\nDatu-konexioa partekatzeko aukerari esker, SIM txartel batetik bestera bidal ditzakezu datuak, datuak jasotzen dituen SIM txartelean deiak egin eta jasotzeko."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Deiak"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMSa"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2767e0f..75d6273 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1841,7 +1841,7 @@
<string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"وقتی الگو را کشیدید، انگشتتان را بردارید"</string>
<string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را به یکدیگر متصل کنید. دوباره امتحان کنید."</string>
<string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"الگو ضبط شد"</string>
- <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"برای تأیید دوباره الگو را بکشید"</string>
+ <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"برای تأیید، دوباره الگو را بکشید"</string>
<string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"الگوی جدید بازگشایی قفلتان"</string>
<string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"تأیید"</string>
<string name="lockpattern_restart_button_text" msgid="255339375151895998">"کشیدن مجدد"</string>
@@ -2259,7 +2259,7 @@
<string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعکها"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"هیچ سمعکی متصل نشده است"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"افزودن سمعکها"</string>
- <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"برای مرتبطسازی سمعکتان، دستگاهتان را در صفحه بعدی پیدا کنید و روی آن ضربه بزنید. مطمئن شوید سمعکتان در حالت مرتبطسازی باشد."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"برای مرتبطسازی سمعکتان، دستگاهتان را در صفحه بعد پیدا کنید و روی آن ضربه بزنید. مطمئن شوید سمعکتان در حالت مرتبطسازی باشد."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> سمعک ذخیرهشده</item>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"رتبهبندی خودکار اعلانها براساس ارتباط"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"بازخورد اعلان تطبیقی"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"تنظیمات انجامشده برای اعلانها را مشخص میکند و گزینه مربوط به ارائه بازخورد به سیستم را نمایش میدهد"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"بازنشاندن اهمیت اعلان"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"بازنشاندن تنظیمات اهمیت تغییریافته توسط کاربر و مجاز کردن دستیار اعلان برای اولویتبندی"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"پاسخها و اقدامات پیشنهادی"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"نمایش خودکار اقدامات و پاسخهای پیشنهادی"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"نمایش اعلانهای اخیر و بهتعویق افتاده"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"هنگام اتصال به <xliff:g id="CARRIER">%1$s</xliff:g>، دردسترس نیست"</string>
<string name="see_more" msgid="7499355691042812723">"موارد بیشتر"</string>
<string name="see_less" msgid="2642392725363552793">"مشاهده موارد کمتر"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> روشن شود؟"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"سیمکارت روشن شود؟"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> میروید؟"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"برای استفاده از سیمکارت، شرکت مخابراتیتان را عوض میکنید؟"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"هربار فقط یک سیمکارت را میتوان فعال کرد.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما را لغو نخواهد کرد."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"هربار فقط یک سیمکارت بارگیریشده میتواند فعال شود.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما لغو نخواهد شد."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"هربار فقط یک سیمکارت را میتوان فعال کرد.\n\nعوض کردن شرکت مخابراتی، باعث لغو سرویس <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> شما نخواهد شد."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"رفتن به <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"درحال اتصال به شبکه…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"درحال رفتن به <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"شرکت مخابراتی عوض نشد"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"بهدلیل بروز خطا، این شرکت مخابراتی عوض نشد."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> خاموش شود؟"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"سیمکارت خاموش شود؟"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"خاموش کردن سیمکارت<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"شرکت مخابراتی غیرفعال نشد"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"شرکت مخابراتی غیرفعال نشد"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"مشکلی پیش آمد و شرکت مخابراتیتان غیرفعال نشد."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"از ۲ سیمکارت استفاده میکنید؟"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"این دستگاه میتواند همزمان ۲ سیمکارت فعال داشته باشد. برای ادامه استفاده از ۱ سیمکارت در هربار، روی «نه متشکرم» ضربه بزنید."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"دستگاه بازراهاندازی شود؟"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"برای شروع به کار، دستگاهتان را بازراهاندازی کنید. سپس میتوانید سیمکارت دیگری اضافه کنید."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ادامه"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"بازراهاندازی"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"نه متشکرم"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"عوض کردن"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"سیمکارت فعال نشد"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"سیمکارت را خارج کنید و دوباره در دستگاه بگذارید. اگر مشکل ادامه داشت، دستگاهتان را بازراهاندازی کنید."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"سیمکارت را دوباره روشن کنید. اگر مشکل ادامه داشت، دستگاهتان را بازراهاندازی کنید."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"این سیمکارت بارگیریشده پاکسازی شود؟"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"با پاکسازی این سیمکارت، سرویس <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> از این دستگاه برداشته میشود.\n\nسرویس مربوط به <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> لغو نمیشود."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"پاکسازی"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوتوث روشن میشود"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"روشن"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"خاموش"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"اینترنت"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"سیمکارتها"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"شبکههای ایمن در هواپیما"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"پیدا کردن و متصل شدن به شبکههای ایمن در هواپیما"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"هواپیما، ایمن در هواپیما"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"تماس و پیامک"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"تماس ازطریق WiFi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"برقراری و دریافت تماس ازطریق شبکههای غیرمخابراتی مثل Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"«تماس ازطریق Wi-Fi» امکان برقراری و دریافت تماس ازطریق شبکههای غیرمخابراتی (مثل برخی از شبکههای Wi-Fi) را به شما میدهد.\n\nتماس بین سیمکارت به شما اجازه میدهد از داده تلفن همراه یک سیمکارت برای برقراری و دریافت تماس از سیمکارت دیگری بهره ببرید."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"تماس"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"پیامک"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2fe3b08..4780689 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjestä ilmoitukset automaattisesti olennaisuuden mukaan"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Mukautuva ilmoituspalaute"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näytä ilmoituksiin tehdyt muutokset ja miten järjestelmästä voi antaa palautetta"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Nollaa ilmoitusten tärkeys"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Nollaa käyttäjän muuttamat tärkeysasetukset ja salli ilmoitusapurin priorisoida ilmoituksia"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Toiminta- ja vastausehdotukset"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Näytä toiminta- ja vastausehdotukset automaattisesti."</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Näytä viimeaikaiset ja myöhemmäksi siirretyt ilmoitukset"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ei käytettävissä <xliff:g id="CARRIER">%1$s</xliff:g> ‑käytön aikana"</string>
<string name="see_more" msgid="7499355691042812723">"Lisää"</string>
<string name="see_less" msgid="2642392725363552793">"Näytä vähemmän"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Otetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> käyttöön?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Otetaanko SIM-kortti käyttöön?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vaihdetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> käyttöön?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vaihdetaanko SIM-korttiin?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vain yksi SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>) ei peruuteta, jos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vain yksi ladattu SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>) ei peruuteta, jos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vain yksi SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>) ei peruuteta, jos vaihdat uuteen."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Vaihda: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Yhdistetään verkkoon…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaattoria ei voi vaihtaa"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaattorin vaihto ei onnistu virheen takia."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Laitetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> pois päältä?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Laitetaanko SIM-kortti pois päältä?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Laitetaan SIM-korttia pois päältä<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaattoria ei voi poistaa käytöstä"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaattoria ei voi poistaa käytöstä"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Jotain meni pieleen. Operaattoria ei voitu poistaa käytöstä."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Käytetäänkö kahta SIM-korttia?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Tällä laitteella voi olla kaksi aktiivista SIM-korttia yhtä aikaa. Jos haluat edelleen käyttää yhtä kerrallaan, valitse Ei kiitos."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Käynnistetäänkö laite uudelleen?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Käynnistä ensin laite uudelleen. Sitten voit lisätä toisen SIM-kortin."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Jatka"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Käynnistä uudelleen"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ei kiitos"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Vaihda"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-korttia ei voi aktivoida"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Poista SIM-kortti ja aseta se takaisin. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Kokeile kytkeä SIM-kortti päälle uudelleen. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Tyhjennetäänkö ladattu SIM-kortti?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Tämän SIM-kortin tyhjentäminen poistaa palvelun (<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>) laitteelta.\n\nPalvelua (<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>) ei peruuteta."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Tyhjennä"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth käynnistyy."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Päällä"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Poissa päältä"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kortit"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Lentokoneturvalliset verkot"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Hae lentokoneturvallisia verkkoja ja muodosta yhteys niihin"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lentokone, lentokoneturvallinen"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Puhelut ja tekstiviestit"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-puhelut"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Soita ja vastaanota puheluita muun kuin operaattorin verkon (esim. Wi-Fi-verkon) kautta"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi-puheluilla voit soittaa ja vastaanottaa puheluita muun kuin operaattorin verkon (esim. joidenkin Wi-Fi-verkkojen) kautta.\n\nSIM-korttien välisillä puheluilla voit soittaa puheluita toiseen SIM-korttiin ja vastaanottaa niitä hyödyntämällä kortin mobiilidataa."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Puhelut"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Tekstiviestit"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 28cda1e..ef14edb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -475,8 +475,8 @@
<string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Chiffrer la tablette"</string>
<string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Chiffrer le téléphone"</string>
<string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Chiffré"</string>
- <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
- <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+ <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+ <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
<string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Chiffrer la tablette"</string>
<string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Chiffrer le téléphone"</string>
<string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -496,11 +496,11 @@
<string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
<string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Saisissez votre mot de passe."</string>
<string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Échec du chiffrement"</string>
- <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
- <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+ <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+ <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Échec du déchiffrement"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
<string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Changer le mode de saisie"</string>
<string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sécurisez votre téléphone"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Définir un verr. de l\'écran pour protéger la tablette"</string>
@@ -1824,9 +1824,9 @@
<string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
<string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
<string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
- <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
- <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
- <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+ <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le schéma précédent."</string>
+ <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le NIP précédent."</string>
+ <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"Paramètres par défaut du téléphone rétablis. Pour l\'utiliser, entrez le mot de passe précédent."</string>
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Vérifier le schéma"</string>
<string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Vérifier le NIP"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Vérifier le mot de passe"</string>
@@ -3315,7 +3315,7 @@
<string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"économiseur de pile, fixe, persistant, économie d\'énergie, pile"</string>
<string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
<string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appels avancés, appels 4g"</string>
- <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajoutez une langue"</string>
+ <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajouter une langue"</string>
<string name="keywords_font_size" msgid="336803136451166298">"taille du texte"</string>
<string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
<string name="sound_settings_summary" msgid="944761906531715109">"Le volume pour la sonnerie et les notifications est réglé à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires à propos des notifications adaptatives"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option de fournir des commentaires au système"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Réinitialiser l\'importance des notifications"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Réinitialiser les paramètres d\'importances modifiés par l\'utilisateur et autoriser l\'assistant des notifications à prioriser"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggestions d\'actions et de réponses"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les suggestions d\'actions et de réponses"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et reportées"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque vous êtes connectés au réseau de <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"En voir plus"</string>
<string name="see_less" msgid="2642392725363552793">"En voir moins"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation d\'une carte SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Une seule carte SIM téléchargée peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer à un autre réseau n\'annulera pas votre service auprès de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connexion au réseau en cours…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passage à <xliff:g id="CARRIER_NAME">%1$s</xliff:g> en cours…"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossible de changer de fournisseur de services"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossible de changer de fournisseur de services en raison d\'une erreur."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM en cours<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossible de désactiver le fournisseur de services"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver le fournisseur de services"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Une erreur s\'est produite et le fournisseur de services n\'a pas pu être désactivé."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil prend en charge deux cartes SIM actives simultanément. Pour continuer d\'utiliser une seule carte SIM à la fois, touchez « Non merci »"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pourrez ensuite ajouter une carte SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Non merci"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM, puis réinsérez-la. Si le problème persiste, redémarrez votre appareil."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Réessayer d\'activer la carte SIM. Si le problème persiste, redémarrez votre appareil."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Effacer ce module SIM téléchargé?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Si vous effacez ce module SIM, le service de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sera retiré de cet appareil.\n\nLe service de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas annulé."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Effacer"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activé"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Réseaux sécuritaires pour les avions"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Trouvez des réseaux sécuritaires pour les avions et connectez-vous-y"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sécuritaire pour les avions"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Appels et messages texte"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Faites et recevez des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"La fonctionnalité d\'appels Wi-Fi vous permet d\'effectuer des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi.\n\nLes appels multi-SIM permettent d\'utiliser les données cellulaires d\'une carte SIM et de faire et recevoir des appels à l\'aide d\'une autre carte SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Messages texte"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f0af53f..9f2b435 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires sur les notifications intelligentes"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option pour fournir des commentaires au système"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Réinitialiser les paramètres d\'importance des notifications"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Réinitialiser les paramètres d\'importance modifiés par l\'utilisateur et autoriser l\'assistant de notifications à les hiérarchiser"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Actions et réponses suggérées"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les actions et réponses suggérées"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et répétées"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Voir plus"</string>
<string name="see_less" msgid="2642392725363552793">"Moins de détails"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation de la carte SIM ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vous ne pouvez activer qu\'une seule carte SIM téléchargée à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nCe changement n\'entraînera pas la résiliation de votre service <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connexion au réseau…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passage à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossible de changer d\'opérateur"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossible de changer d\'opérateur en raison d\'une erreur."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossible de désactiver l\'opérateur"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver l\'opérateur"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Un problème a empêché l\'appareil de désactiver votre opérateur."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil peut posséder deux cartes SIM actives en même temps. Pour continuer à utiliser une seule carte SIM à la fois, appuyez sur \"Non, merci\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pouvez ensuite ajouter une autre carte SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, merci"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM et insérez-la de nouveau. Si le problème persiste, redémarrez l\'appareil."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Essayez à nouveau d\'activer la carte SIM. Si le problème persiste, redémarrez l\'appareil."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Effacer cette carte SIM téléchargée ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"L\'effacement de cette carte SIM va supprimer le service <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de cet appareil.\n\nLe service pour <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas annulé."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Effacer"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activé"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Réseaux acceptés dans les avions"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Rechercher les réseaux acceptés dans les avions et s\'y connecter"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, accepté dans les avions"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Appels et SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Passer et recevoir des appels sur des réseaux non gérés par des opérateurs, comme le Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"La fonctionnalité Appels Wi-Fi vous permet de passer et de recevoir des appels sur des réseaux non gérés par des opérateurs, comme certains réseaux Wi‑Fi.\n\nAvec les appels par cartes SIM croisées, vous pouvez utiliser les données mobiles d\'une carte SIM pour passer et recevoir des appels via une autre carte SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 2cb3531..8504c8f 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasifica as notificacións automaticamente por relevancia"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificacións intelixentes"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica axustes realizados nas notificacións e mostra a opción de enviar comentarios ao sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablecer importancia das notificacións"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restablece as opcións de configuración da importancia modificadas polo usuario e permítelle ao asistente de notificacións establecer as prioridades"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accións suxeridas e respostas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente accións suxeridas e respostas"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostra as notificacións recentes e as adiadas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non dispoñible cando o dispositivo está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ver máis"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Queres activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Queres activar a SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Queres cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Queres pasar a utilizar a tarxeta SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Non se poden ter activadas varias SIM á vez.\n\nAo cambiar a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, non se cancelará o teu servizo de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Non se poden ter activadas varias SIM descargadas á vez.\n\nAo cambiar a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, non se cancelará o teu servizo de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Non se poden ter activadas varias SIM á vez.\n\nAo cambiar, non se cancelará o teu servizo de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Establecendo conexión coa rede…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Non se puido cambiar de operador"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Non se puido cambiar de operador debido a un erro."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Queres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Queres desactivar a SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Non se puido desactivar o operador"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Non se puido desactivar o operador"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Produciuse un erro e non se puido desactivar o operador."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Queres usar 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter 2 SIM activadas á vez. Para continuar usando só 1 SIM, toca Non, grazas."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Queres reiniciar o dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para comezar, reinicia o dispositivo. Despois, poderás engadir outra SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, grazas"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Non se puido activar a SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita a SIM e introdúcea de novo. Se o problema persiste, reinicia o dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tenta activar a SIM de novo. Se o problema persiste, reinicia o dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Queres borrar esta SIM descargada?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ao borrar esta SIM, quitarase o servizo de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nNon se cancelará o servizo de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Activarase o Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activar"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivar"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Tarxetas SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para os avións"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca redes seguras para os avións e establece conexión con elas"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para os avións"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas por wifi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Facer e recibir chamadas a través de redes que non pertencen a ningún operador, como as redes wifi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Coa función Chamadas por wifi podes facer e recibir chamadas a través de redes que non pertencen a ningún operador, como algunhas redes wifi.\n\nCoas chamadas entre SIM distintas podes aproveitar os datos móbiles dunha SIM para facer e recibir chamadas doutra SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8cf21da..ca46aca 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1872,7 +1872,7 @@
<string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"ઉપકરણ સ્ક્રીન લૉકની સમાન"</string>
<string name="manageapplications_settings_title" msgid="9198876415524237657">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
<string name="manageapplications_settings_summary" msgid="848586372489062357">"ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સનું સંચાલન કરો અને દૂર કરો"</string>
- <string name="applications_settings" msgid="1941993743933425622">"ઍપ્લિકેશનની માહિતી"</string>
+ <string name="applications_settings" msgid="1941993743933425622">"ઍપની માહિતી"</string>
<string name="applications_settings_summary" msgid="8206066893744768531">"ઍપ મેનેજ કરો, ઝડપી લૉન્ચ શૉર્ટકટ સેટ કરો"</string>
<string name="applications_settings_header" msgid="3154670675856048015">"ઍપ્લિકેશન સેટિંગ્સ"</string>
<string name="install_applications" msgid="3921609656584369901">"અજાણ્યા સ્ત્રોતો"</string>
@@ -1889,7 +1889,7 @@
<string name="install_all_warning" product="device" msgid="2348262609815354500">"તમારું ઉપકરણ અને વ્યક્તિગત ડેટા અજાણી ઍપના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ ઇન્સ્ટૉલ કરીને, તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ઉપકરણને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
<string name="advanced_settings" msgid="2368905204839169094">"વિગતવાર સેટિંગ"</string>
<string name="advanced_settings_summary" msgid="1823765348195530035">"વધુ સેટિંગ્સ વિકલ્પો સક્ષમ કરો"</string>
- <string name="application_info_label" msgid="1015706497694165866">"ઍપ્લિકેશન માહિતી"</string>
+ <string name="application_info_label" msgid="1015706497694165866">"ઍપની માહિતી"</string>
<string name="storage_label" msgid="2522307545547515733">"સ્ટોરેજ"</string>
<string name="auto_launch_label" msgid="4069860409309364872">"ડિફોલ્ટ તરીકે ખોલો"</string>
<string name="auto_launch_label_generic" msgid="5033137408273064599">"ડિફૉલ્ટ્સ"</string>
@@ -2563,7 +2563,7 @@
<string name="usage_type_computed_power" msgid="5191902025833668752">"ગણતરી કારયેલ પાવર ઉપયોગ"</string>
<string name="usage_type_actual_power" msgid="1221358930299037926">"નિરીક્ષિત પાવર ઉપયોગ"</string>
<string name="battery_action_stop" msgid="6998228610098034316">"ફરજિયાત બંધ કરો"</string>
- <string name="battery_action_app_details" msgid="7201369216798227707">"ઍપ્લિકેશન માહિતી"</string>
+ <string name="battery_action_app_details" msgid="7201369216798227707">"ઍપની માહિતી"</string>
<string name="battery_action_app_settings" msgid="2437124469335488464">"ઍપ્લિકેશન સેટિંગ્સ"</string>
<string name="battery_action_display" msgid="6515712081248863749">"સ્ક્રીન સેટિંગ્સ"</string>
<string name="battery_action_wifi" msgid="1829212604573932607">"વાઇ-ફાઇ સેટિંગ્સ"</string>
@@ -2834,7 +2834,7 @@
<string name="data_usage_app_summary_title" msgid="4933742247928064178">"મોબાઇલ ડેટા અને Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="6832015632699116754">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
<string name="data_usage_app" msgid="6367974637783240699">"ઍપ્લિકેશન વપરાશ"</string>
- <string name="data_usage_app_info_label" msgid="3542220416056122841">"ઍપ્લિકેશન માહિતી"</string>
+ <string name="data_usage_app_info_label" msgid="3542220416056122841">"ઍપની માહિતી"</string>
<string name="data_usage_cellular_data" msgid="1917226172511825849">"મોબાઇલ ડેટા"</string>
<string name="data_usage_data_limit" msgid="1120291692444009289">"ડેટા મર્યાદા સેટ કરો"</string>
<string name="data_usage_cycle" msgid="6875568429140150029">"ડેટા વપરાશ ચક્ર"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ઑટોમૅટિક રીતે નોટિફિકેશનને સુસંગતતા અનુસાર રેંક આપો"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"સુવિધાજનક નોટિફિકેશનનો પ્રતિસાદ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"નોટિફિકેશનમાં કરવામાં આવેલી ગોઠવણો અને સિસ્ટમને પ્રતિસાદ આપવાનો વિકલ્પ બતાવો"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"નોટિફિકેશનનું મહત્ત્વ રીસેટ કરો"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"વપરાશકર્તા દ્વારા બદલવામાં આવેલા \'મહત્ત્વ વિશેના સેટિંગ\' રીસેટ કરો અને નોટિફિકેશન આસિસ્ટંટને પ્રાધાન્યતા નક્કી કરવાની મંજૂરી આપો"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"સૂચવેલી ક્રિયાઓ અને જવાબો"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ઑટોમૅટિક રીતે સૂચવેલી ક્રિયાઓ અને જવાબો બતાવો"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"એકદમ નવા અને સ્નૂઝ કરેલા નોટિફિકેશન બતાવો"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ટૅબ્લેટ ચેક કરવા માટે ટૅપ કરો"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ડિવાઇસ ચેક કરવા માટે ટૅપ કરો"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર ટૅપ કરો."</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ઇમર્જન્સી SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> દ્વારા મેનેજ કરવામાં આવે છે"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ઝટપટ 5 વાર પાવર બટન દબાવીને ઇમર્જન્સી SOS ક્રિયાઓ શરૂ કરો."</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"ચેતવણીનો સાઉન્ડ"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ક્રિયાઓ શરૂ કરતા પહેલાંની અલર્ટ"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"નોટિફિકેશનો માટે ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"તમારા નોટિફિકેશનને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
<string name="see_more" msgid="7499355691042812723">"વધુ જુઓ"</string>
<string name="see_less" msgid="2642392725363552793">"ઓછું જુઓ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને ચાલુ કરીએ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"સિમ ચાલુ કરીએ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરીએ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"શું સિમ કાર્ડના ઉપયોગ પર સ્વિચ કરીએ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"એક સમયે માત્ર એક જ SIMને સક્રિય કરી શકાશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"એક સમયે ડાઉનલોડ કરેલું માત્ર એક જ સિમ સક્રિય રહી શકશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી તમારી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"એક સમયે માત્ર એક જ સિમને સક્રિય કરી શકાશે.\n\nસ્વિચ કરવાથી <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરો"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"નેટવર્ક સાથે કનેક્ટ કરી રહ્યાં છીએ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરી રહ્યાં છીએ"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"કોઈ ભૂલને કારણે મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને બંધ કરીએ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"સિમ કાર્ડ બંધ કરીએ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"સિમ કાર્ડ બંધ કરી રહ્યાં છીએ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"મોબાઇલ ઑપરેટરને બંધ કરી શકાતા નથી"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"મોબાઇલ ઑપરેટરને બંધ કરી શકાતા નથી"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"કંઈક ખોટું થયું હતું અને તમારા મોબાઇલ ઑપરેટરને બંધ કરી શક્યાં નથી."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 સિમનો ઉપયોગ કરીએ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"આ ડિવાઇસમાં એકવારમાં 2 સિમ સક્રિય થઈ શકે છે. એકવારમાં 1 જ સિમનો ઉપયોગ કરવાનું ચાલુ રાખવા માટે, \"ના, આભાર\" પર ટૅપ કરો."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ડિવાઇસ ફરી શરૂ કરીએ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"પ્રારંભ કરવા માટે, તમારા ડિવાઇસને ફરી શરૂ કરો. પછી તમે બીજું સિમ ઉમેરી શકો છો."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"આગળ વધો"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ફરી શરૂ કરો"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ના, આભાર"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"સ્વિચ કરો"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"સિમ કાર્ડ સક્રિય કરી શકાતું નથી"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"સિમ કાર્ડ ફરીથી ચાલુ કરવાનો પ્રયાસ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"આ ડાઉનલોડ કરેલું સિમ કાઢી નાખીએ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"આ સિમ કાઢી નાખવાથી આ ડિવાઇસમાંથી <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> સેવા કાઢી નાખવામાં આવશે.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> માટેની સેવા રદ નહીં થાય."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"કાઢી નાખો"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"બ્લૂટૂથ ચાલુ થશે"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ચાલુ"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"બંધ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ઇન્ટરનેટ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"સિમ"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક શોધો અને તેની સાથે કનેક્ટ કરો"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"એરપ્લેન, એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"કૉલ અને SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"વાઇ-ફાઇ કૉલિંગ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Make and receive calls over non-carrier networks like Wi‑Fi વાઇ-ફાઇ જેવા બિન-મોબાઇલ ઑપરેટર નેટવર્ક પર કૉલ કરો અને કૉલ પ્રાપ્ત કરો વાઇ-ફાઇ જેવી બિન-મોબાઇલ નેટવર્ક સેવાઓ પર કૉલ કરો અને કૉલ પ્રાપ્ત કરો વાઇ-ફાઇ નેટવર્ક જેવા મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી કૉલ કરો અને મેળવો"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"અમુક વાઇ-ફાઇ નેટવર્ક જેમ કે મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી વાઇ-ફાઇ કૉલિંગની સેવા તમને કૉલ કરવાની અને મેળવવાની સુવિધા આપે છે.\n\nક્રોસ-સિમ કૉલિંગની સેવાને કારણે તમે એક સિમ કાર્ડના મોબાઇલ ડેટાના ઉપયોગથી અન્ય સિમ કાર્ડ પરથી કૉલ કરી તેમજ મેળવી શકો છો."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"કૉલ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f4f8a34..eeae08d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"कोई सूचना कितने काम की है, इस हिसाब से उसे अपने-आप रैंक करें"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ज़रूरत के हिसाब से सूचनाओं के बारे में सुझाव दें या शिकायत करें"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"यह सेटिंग, सूचनाओं की प्राथमिकताओं में किए गए बदलावों के बारे में बताती है और सिस्टम के बारे में राय/सुझाव देने के विकल्प दिखाती है"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचना की प्राथमिकताएं रीसेट करें"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"उपयोगकर्ता की ओर से बदली गई प्राथमिकताएं सेटिंग को रीसेट करें. साथ ही, सूचना सहायक को प्राथमिकता तय करने की अनुमति दें"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुझाई गई कार्रवाइयां और जवाब"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुझाई गई कार्रवाइयां और जवाब अपने-आप दिखाएं"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"हाल ही में मिली और स्नूज़ की गई सूचनाएं दिखाएं"</string>
@@ -4502,7 +4504,7 @@
<string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> प्रबंधित करता है"</string>
<string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"आपातकालीन सेवाओं को कॉल करने के लिए, पावर बटन को पांच बार तेज़ी से दबाएं."</string>
<string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"चेतावनी की आवाज़"</string>
- <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"आपातकालीन सेवाओं को कॉल करने से पहले चेतावनी जारी करें"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"आपातकालीन सेवाओं को कॉल करने से पहले आवाज़ वाली चेतावनी जारी करें"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फ़िंगरप्रिंट स्वाइप करें"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अपनी सूचनाएं देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
<string name="see_more" msgid="7499355691042812723">"ज़्यादा देखें"</string>
<string name="see_less" msgid="2642392725363552793">"कम देखें"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू करना चाहते हैं?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"क्या आप सिम चालू करना चाहते हैं?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> का इस्तेमाल करना चाहते हैं?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"क्या आप इस्तेमाल करने के लिए सिम कार्ड पर जाना चाहते हैं?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक समय में, डाउनलोड किया गया सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\nएक से दूसरे सिम पर जाने से, आपको मिल रही <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर जाएं"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्क से कनेक्ट किया जा रहा है…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर ले जाया जा रहा है"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"किसी गड़बड़ी की वजह से, मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> को बंद करना चाहते हैं?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"क्या आप सिम बंद करना चाहते हैं?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद किया जा रहा है<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सकता"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सकता"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"कोई गड़बड़ी हुई, जिसकी वजह से आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सका."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"क्या आप दो सिम इस्तेमाल करना चाहते हैं?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"इस डिवाइस में एक साथ दाे सिम चालू रह सकते हैं. अगर आप एक बार में एक सिम इस्तेमाल करना चाहते हैं, तो \"रहने दें\" पर टैप करें."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"क्या आप डिवाइस को रीस्टार्ट करना चाहते हैं?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"शुरू करने के लिए, अपने डिवाइस को रीस्टार्ट करें. इसके बाद, आप दूसरा सिम जोड़ सकते हैं."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"जारी रखें"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करें"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"रहने दें"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"दूसरे नेटवर्क पर जाएं"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम चालू नहीं किया जा सका"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम निकालकर फिर से लगाएं. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम दोबारा चालू करने की कोशिश करें. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"क्या आप डाउनलोड किए गए इस सिम को हमेशा के लिए मिटाना चाहते हैं?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"इस सिम को डिवाइस से हमेशा के लिए मिटाने पर, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> की सेवा हट जाती है.\n\nहालांकि, <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> की सेवा नहीं हटेगी."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"हमेशा के लिए मिटाएं"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ चालू हो जाएगा"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"चालू है"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद है"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"हवाई जहाज़ सुरक्षित नेटवर्क"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"हवाई जहाज़ सुरक्षित नेटवर्क ढूंढें और उससे जुड़ें"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाई जहाज़, हवाई जहाज़ सुरक्षित नेटवर्क"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"कॉल और मैसेज (एसएमएस)"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"वाई-फ़ाई कॉलिंग"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ऐसे नेटवर्क से कॉल करें और उन पर कॉल पाएं जो सिम का इस्तेमाल नहीं करते, जैसे वाई-फ़ाई नेटवर्क"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"वाई-फ़ाई कॉलिंग आपको ऐसे नेटवर्क से कॉल करने और उन पर कॉल पाने की सुविधा देती है जो सिम का इस्तेमाल नहीं करते, जैसे कुछ वाई-फ़ाई नेटवर्क.\n\nक्रॉस-सिम कॉलिंग की मदद से, आप एक सिम के मोबाइल डेटा का इस्तेमाल करके, दूसरे सिम वाले नंबर से कॉल कर सकते हैं और उस पर कॉल पा सकते हैं."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"मैसेज (एसएमएस)"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3aa5598..a9591f2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski poredaj obavijesti prema važnosti"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavijestima"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Navedi prilagodbe obavijesti i prikaži opciju pružanja povratnih informacija sustavu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Vraćanje važnosti obavijesti na zadano"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Postavke važnosti koje je korisnik promijenio vratite na zadane i dopustite pomoćniku za obavijesti da određuje prioritete"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikaži predložene radnje i odgovore"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavne i odgođene obavijesti"</string>
@@ -3622,7 +3624,7 @@
<string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste izmijenili"</string>
<string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Izbriši nedavno"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Izbriši nedavne"</string>
<string name="clear" msgid="5092178335409471100">"Izbriši"</string>
<string name="important_bubble" msgid="7911698275408390846">"Prikaži prioritetne razgovore u oblačićima"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori prikazuju se pri vrhu zaslona obavijesti. Možete postaviti i da se prikazuju u oblačićima te vas ometaju dok je uključena značajka Ne uznemiravaj."</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Prikaži više"</string>
<string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite li prijeći na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite li prijeći na SIM karticu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Istovremeno može biti aktivan samo jedan preuzeti SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom se neće otkazati vaša usluga kod mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebacite se na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prijelaz na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Promjena mobilnog operatera nije uspjela"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Mobilni operater ne može se promijeniti zbog pogreške."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Onemogućivanje mobilnog operatera nije uspjelo"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Onemogućivanje mobilnog operatera nije uspjelo"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto je pošlo po zlu i onemogućivanje mobilnog operatera nije uspjelo."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite li upotrebljavati dvije SIM kartice?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ovaj uređaj istovremeno može imati dvije aktivne SIM kartice. Da biste nastavili s upotrebom samo jedne SIM kartice, dodirnite \"Ne, hvala\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite li ponovo pokrenuti uređaj?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Za početak ponovo pokrenite uređaj. Zatim možete dodati drugu SIM karticu."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Pokreni ponovo"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Promijeni"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM se ne može aktivirati"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM i umetnite ga ponovo. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite li izbrisati taj preuzeti SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Brisanjem ovog SIM-a uklanja se usluga mobilnog operatera <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> s ovog uređaja.\n\nUsluga mobilnog operatera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> neće se otkazati."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Izbriši"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže sigurne za rad u zrakoplovu"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže sigurne za rad u zrakoplovu i povežite se s njima"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"zrakoplov, sigurno za rad u zrakoplovu"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi pozivi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Upućujte i primajte pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su Wi-Fi mreže"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi pozivi omogućuju vam upućivanje i primanje poziva putem mreža koje ne pripadaju mobilnom operateru kao što su neke Wi-Fi mreže.\n\nPozivi putem više SIM kartica omogućuju vam da iskoristite mobilne podatke SIM kartice kako biste s druge SIM kartice mogli upućivati i primati pozive."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2aeb17f..595f1cf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1496,7 +1496,7 @@
<string name="storage_detail_system" msgid="3797439069473271732">"Rendszer"</string>
<string name="storage_detail_explore" msgid="13782374784415466">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</string>
<string name="storage_detail_dialog_other" msgid="3359851869961609901">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nA(z) <xliff:g id="NAME">^1</xliff:g> látható tartalmainak megtekintéséhez koppintson a Felfedezés lehetőségre."</string>
- <string name="storage_detail_dialog_system" msgid="7461009051858709479">"A rendszer tartalmaz <xliff:g id="VERSION">%s</xliff:g> verziójú Android futtatásához használt fájlokat"</string>
+ <string name="storage_detail_dialog_system" msgid="7461009051858709479">"A rendszer az Android <xliff:g id="VERSION">%s</xliff:g>. verziójának futtatásához használt fájlokat tartalmaz"</string>
<string name="storage_detail_dialog_user" msgid="1691219071007313226">"Lehetséges, hogy <xliff:g id="USER_0">^1</xliff:g> felhasználó fotókat, zenét, alkalmazásokat vagy más adatokat mentett, amihez <xliff:g id="SIZE">^2</xliff:g> tárhelyet használt fel.\n\nA részleteket megtekintheti, ha átvált a következő felhasználóra: <xliff:g id="USER_1">^1</xliff:g>."</string>
<string name="storage_wizard_init_title" msgid="9036374223934708619">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
<string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Használat hordozható tárolóként"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Értesítések automatikus rangsorolása relevancia szerint"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Visszajelzés adaptív értesítésekről"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Az értesítések módosításainak jelzése, valamint a rendszernek küldhető visszajelzési lehetőség megjelenítése"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Fontossági beállítások visszaállítása"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"A felhasználó által módosított fontossági beállítások visszaállítása és a priorizálás engedélyezése az értesítési segéd számára."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Javasolt műveletek és válaszok"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Javasolt műveletek és válaszok automatikus megjelenítése"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Legutóbbi és elhalasztott értesítések megjelenítése"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nem hozzáférhető, amikor a következőhöz csatlakozik: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Továbbiak"</string>
<string name="see_less" msgid="2642392725363552793">"Kevesebb megjelenítése"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Bekapcsolja a következőt: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Bekapcsolja a SIM-et?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vált a(z) <xliff:g id="CARRIER_NAME">%1$s</xliff:g> szolgáltatóra?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Átvált SIM-kártya használatára?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Egyszerre csak egy SIM-kártya lehet aktív.\n\nA(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatóra történő váltással nem mondja le a(z) <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> szolgáltatását."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Egyszerre csak egy letöltött SIM lehet aktív.\n\nA(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatóra történő váltással nem mondja le a(z) <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> szolgáltatását."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Egyszerre csak egy SIM-kártya lehet aktív.\n\nA váltással nem mondja le a(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatását."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Váltás erre: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Csatlakozás hálózathoz…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"A következőre történő váltás folyamatban van: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nem lehet szolgáltatót váltani"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Hiba történt, ezért nem lehet szolgáltatót váltani."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kikapcsolja a következőt: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kikapcsolja a SIM-et?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kikapcsolása<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nem sikerült a szolgáltató letiltása"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nem sikerült a szolgáltató letiltása"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hiba történt, ezért nem sikerült a szolgáltató letiltása."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Kettő SIM-kártyát szeretne használni?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ezen az eszközön egyszerre két SIM-kártya is aktív lehet. Ha továbbra is csak egy SIM-kártyát szeretne használni, koppintson a „Köszönöm, nem” gombra."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Újraindítja az eszközt?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Kezdő lépésként indítsa újra az eszközt. Ezt követően újabb SIM-kártyát adhat hozzá."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Tovább"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Újraindítás"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Köszönöm, nem"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Váltás"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nem sikerült a SIM aktiválása"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Távolítsa el a SIM-kártyát, majd helyezze be újra. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Próbálkozzon meg újra a SIM bekapcsolásával. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Törli ezt a letöltött SIM-et?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"A SIM törlésével eltávolítja a(z) <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> szolgáltatását erről az eszközről.\n\nA(z) <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> szolgáltatását nem mondja le."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Törlés"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"A Bluetooth bekapcsol"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Be"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Ki"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kártyák"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Repülőgépen használható hálózatok"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Repülőgépen használható hálózatok keresése és csatlakozás hozzájuk"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"repülőgép, repülőgépen használható"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Hívások és SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-hívás"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Hívások indítása és fogadása nem szolgáltatói hálózaton (pl. Wi-Fi)"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"A Wi-Fi-hívás funkció segítségével hívásokat indíthat és fogadhat nem szolgáltatói hálózatokon, így például bizonyos Wi-Fi-hálózatokon.\n\nA SIM-kártyákon átívelő hívás segítségével az egyik SIM-kártya adatforgalmát felhasználva indíthat és fogadhat hívásokat a másik SIM-kártyán."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Hívások"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ac33d6f..0403121 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ավտոմատ տեսակավորել ծանուցումներն ըստ կարևորության"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Հարմարվող ծանուցումների մասին կարծիքի հայտնում"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Նշել ծանուցումների հետ կապված ճշգրտումները և ցույց տալ, թե ինչպես կարծիք ուղարկել համակարգին"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Վերակայել ծանուցումների կարևորության կարգավորումները"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Վերակայել օգտատիրոջ կողմից փոփոխված կարևորության կարգավորումները և թույլատրել հավելվածին որոշել ծանուցումների առաջնահերթությունը"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Առաջարկվող գործողություններ և պատասխաններ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ավտոմատ ցուցադրել առաջարկվող գործողություններն ու պատասխանները"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Տեսնել վերջին և հետաձգված ծանուցումները"</string>
@@ -4627,7 +4629,7 @@
<string name="autofill_max_partitions" msgid="7342195529574406366">"Առավելագույն հարցումների թիվը աշխատաշրջանի համար"</string>
<string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Տեսանելի տվյալակազմերի առավելագույն քանակը"</string>
<string name="autofill_reset_developer_options" msgid="6425613608979498608">"Վերականգնել կանխադրված արժեքները"</string>
- <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ինքնալրացման կարգավորումները վերակայվեցին"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ինքնալրացման կարգավորումները զրոյացվեցին"</string>
<string name="device_theme" msgid="5027604586494772471">"Սարքի թեման"</string>
<string name="default_theme" msgid="4815428567082263639">"Կանխադրված"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"Ցանցի անունը"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Հասանելի չէ <xliff:g id="CARRIER">%1$s</xliff:g>-ին միանալու դեպքում"</string>
<string name="see_more" msgid="7499355691042812723">"Տեսնել ավելին"</string>
<string name="see_less" msgid="2642392725363552793">"Տեսնել ավելի քիչ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Միացնե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ը"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Միացնե՞լ SIM քարտը"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Անցնե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Անցնե՞լ SIM քարտի օգտագործմանը"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ SIM քարտ։\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ին անցնելու դեպքում <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ ներբեռնված SIM քարտ։\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ին անցնելու դեպքում <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ SIM քարտ։\n\nՕպերատորին փոխելու դեպքում <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Անցնել <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Սարքը միանում է ցանցին…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Անցում <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին…"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Չհաջողվեց փոխել օպերատորին"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Չհաջողվեց փոխել օպերատորին։"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Անջատե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> օպերատորին"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Անջատե՞լ SIM քարտը"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM քարտն անջատվում է<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Չհաջողվեց անջատել օպերատորին"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Չհաջողվեց անջատել օպերատորին"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Սխալի պատճառով հնարավոր չէ անջատել ձեր օպերատորին։"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Օգտագործե՞լ 2 SIM քարտ"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Այս սարքում հնարավոր է օգտագործել միաժամանակ 2 SIM քարտ։ Միայն մեկ SIM քարտ օգտագործելու համար հպեք «Ոչ, շնորհակալություն» կոճակին։"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Վերագործարկե՞լ սարքը"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Սկսելու համար վերագործարկեք սարքը։ Այնուհետև կարող եք ավելացնել այլ SIM քարտ։"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Շարունակել"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Վերագործարկել"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ոչ, շնորհակալություն"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Փոխել օպերատորին"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Չհաջողվեց ակտիվացնել SIM քարտը"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Հանեք, այնուհետև նորից տեղադրեք SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Փորձեք նորից միացնել SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Ջնջե՞լ այս ներբեռնված SIM քարտը"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Այս SIM-ը ջնջելու դեպքում <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-ի ծառայությունը կհեռացվի սարքից։\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-ի ծառայությունը չի չեղարկվի։"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ջնջել"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Կմիանա Bluetooth-ը"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Միացված է"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Անջատված է"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Ինտերնետ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM քարտեր"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Գտնել և միանալ ցանցի, որն անվտանգ է ինքնաթիռում"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ինքնաթիռ, ինքնաթիռում անվտանգ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Զանգեր և SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Զանգեր Wi-Fi-ով"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Կատարել և ստանալ զանգերը բջջային օպերատորների փոխարեն այլ ցանցերի, օրինակ՝ Wi-Fi-ի միջոցով"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"«Զանգեր Wi-Fi-ով» գործառույթը թույլ է տալիս ձեզ ստանալ և կատարել զանգերը, օրինակ՝ որոշ Wi‑Fi ցանցերի, այլ ոչ թե բջջային օպերատորների միջոցով։\n\nԽաչաձևող աշխատանքի շնորհիվ կարելի է մեկ SIM քարտում բջջային ինտերնետի միջոցով կատարել զանգեր կամ ստանալ դրանք մյուս SIM-ից։"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Զանգեր"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0564a98..17870ae 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Otomatis mengurutkan notifikasi menurut relevansi"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Masukan notifikasi adaptif"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Menunjukkan penyesuaian yang dilakukan pada notifikasi dan menampilkan opsi untuk memberikan masukan ke sistem"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Mereset tingkat kepentingan notifikasi"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset setelan penting yang diubah pengguna dan izinkan asisten notifikasi diprioritaskan"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Saran tindakan dan balasan"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Otomatis tampilkan saran tindakan & balasan"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Tampilkan notifikasi baru-baru ini dan yang ditunda"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia saat terhubung ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Lihat lainnya"</string>
<string name="see_less" msgid="2642392725363552793">"Lihat lebih sedikit"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Aktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Aktifkan SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Beralih menggunakan kartu SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nPengalihan tidak akan membatalkan layanan <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Menghubungkan ke jaringan…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mengalihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Tidak dapat mengalihkan operator"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operator tidak dapat dialihkan karena error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Nonaktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Nonaktifkan SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Menonaktifkan SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Tidak dapat menonaktifkan operator"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Tidak dapat menonaktifkan operator"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Terjadi error dan operator Anda tidak dapat dinonaktifkan."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gunakan 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Perangkat ini dapat memiliki 2 SIM aktif sekaligus. Untuk terus menggunakan 1 SIM dalam satu waktu, ketuk \"Lain kali\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Mulai ulang perangkat?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Untuk memulai, mulai ulang perangkat. Lalu, Anda dapat menambahkan SIM lain."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Lanjutkan"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Mulai ulang"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Lain kali"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Alihkan"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM, lalu masukkan lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Coba aktifkan SIM lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Hapus SIM yang didownload ini?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Menghapus SIM ini akan menghapus layanan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> dari perangkat ini.\n\nLayanan untuk <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> tidak akan dibatalkan."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Hapus"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan diaktifkan"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktif"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Nonaktif"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Jaringan aman di pesawat"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Temukan dan hubungkan ke jaringan aman di pesawat"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, aman di pesawat"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan Telepon dan SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Melakukan dan menerima panggilan dari jaringan non-operator seperti Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Dengan panggilan Wi-Fi, Anda dapat melakukan dan menerima panggilan dari jaringan non-operator seperti jaringan Wi-Fi tertentu.\n\nDengan panggilan lintas-SIM, Anda dapat menggunakan data seluler SIM untuk melakukan dan menerima panggilan dari SIM lain."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Panggilan Telepon"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 766e311..2dd7fc9 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2243,7 +2243,7 @@
<string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Titringur hringingar"</string>
<string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Snertisvörun"</string>
<string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Nota <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Opna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>: Opna"</string>
<string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Nota litaleiðréttingu"</string>
<string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Birta skjátexta"</string>
<string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Aðeins fyrir stutt forrit"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Raða tilkynningum sjálfkrafa eftir vægi"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Breytilegar ábendingar um tilkynningar"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Gefa til kynna breytingar á tilkynningum og sýna valkostinn til að senda kerfinu ábendingar"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Endurstilla forgang tilkynninga"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Endurstilla forgangsröðun notanda og leyfa tilkynningahjálpara að forgangsraða"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tillögur að aðgerðum og svörum"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Sýna sjálfkrafa tillögur að aðgerðum og svörum"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Sýna nýlegar og frestaðar tilkynningar"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ekki í boði þegar tenging við <xliff:g id="CARRIER">%1$s</xliff:g> er til staðar"</string>
<string name="see_more" msgid="7499355691042812723">"Sjá meira"</string>
<string name="see_less" msgid="2642392725363552793">"Sjá minna"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Viltu kveikja á <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Kveikja á SIM-korti?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Skipta yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Viltu skipta yfir í að nota SIM-kort?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aðeins eitt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir yfir í <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> verður þjónustunni hjá <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ekki sagt upp."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aðeins eitt sótt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir yfir í <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> verður þjónustunni hjá <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ekki sagt upp."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Aðeins eitt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir verður þjónustunni hjá <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ekki sagt upp."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skipta yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Tengist farsímakerfi…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skiptir yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ekki hægt að skipta um símafyrirtæki"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Ekki er hægt að skipta um símafyrirtæki sökum villu."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Viltu slökkva á <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Slökkva á SIM-korti?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slekkur á SIM-korti<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ekki er hægt að gera símafyrirtæki óvirkt"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ekki er hægt að gera símafyrirtæki óvirkt"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Eitthvað fór úrskeiðis og ekki var hægt að gera símafyrirtækið óvirkt."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Viltu nota 2 SIM-kort?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Þetta tæki getur verið með tvö SIM-kort virk í einu. Ýttu á „Nei takk“ til að halda áfram að nota aðeins eitt SIM-kort."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Endurræsa tæki?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Endurræstu tækið til að hefjast handa. Að því loknu geturðu bætt öðru SIM-korti við."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Áfram"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Endurræsa"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei, takk"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Skipta"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ekki er hægt að virkja SIM-kort"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjarlægðu SIM-kortið og settu það inn aftur. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prófaðu að kveikja aftur á SIM-kortinu. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Viltu eyða þessu sótta SIM-korti?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ef þessu SIM-korti er eytt verður þjónusta <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> verður ekki sagt upp."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Eyða"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Kveikt verður á Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Kveikt"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Slökkt"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Örugg flugnetkerfi"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Finna og tengjast öruggum flugnetkerfum"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flugnetkerfi, öruggt flugnet"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Símtöl og SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi símtöl"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Hringja og svara símtölum utan farsímakerfis, t.d. á Wi-Fi neti"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Með Wi-Fi símtölum geturðu hringt og svarað símtölum utan farsímakerfis, t.d. á sumum Wi-Fi netum.\n\nSímtöl á milli SIM-korta gera þér kleift að nota farsímagögn á einu SIM-korti til að hringja og svara símtölum frá öðru SIM-korti."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Símtöl"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a7dde3d..3d4f5f4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Posiziona automaticamente le notifiche in base alla pertinenza"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback relativo alle notifiche adattive"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica le modifiche apportate alle notifiche e mostra la possibilità di fornire feedback al sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reimposta importanza notifiche"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reimposta le impostazioni relative all\'importanza modificate dall\'utente e consenti all\'assistente notifiche di assegnare la priorità"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Azioni e risposte consigliate"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente azioni e risposte consigliate"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostra notifiche recenti e posticipate"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Altro"</string>
<string name="see_less" msgid="2642392725363552793">"Comprimi"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vuoi attivare <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vuoi attivare la SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vuoi passare a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vuoi passare alla scheda SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"È possibile attivare una sola SIM alla volta.\n\nIl passaggio a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> non annullerà il servizio di <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"È possibile attivare una sola SIM scaricata alla volta.\n\nIl passaggio a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> non annullerà il servizio di <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"È possibile attivare una sola SIM alla volta.\n\nIl passaggio non annullerà il servizio di <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passa a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connessione alla rete…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passaggio a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossibile passare a un altro operatore"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossibile passare a un altro operatore a causa di un errore."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vuoi disattivare <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vuoi disattivare la SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Disattivazione SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossibile disattivare l\'operatore"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossibile disattivare l\'operatore"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Si è verificato un problema; impossibile disattivare l\'operatore."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vuoi usare due SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Questo dispositivo può avere due SIM attive alla volta. Per continuare a utilizzare una sola SIM alla volta, tocca \"No grazie\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vuoi riavviare il dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Per iniziare, riavvia il dispositivo. Dopodiché puoi aggiungere un\'altra SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continua"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Riavvia"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"No grazie"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Cambia"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossibile attivare la SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Rimuovi la SIM e inseriscila di nuovo. Se il problema persiste, riavvia il dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Riprova ad attivare la SIM. Se il problema persiste, riavvia il dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Resettare questa SIM scaricata?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Se resetti questa SIM, il servizio di <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> verrà rimosso da questo dispositivo.\n\nIl servizio di <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> non verrà annullato."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Resetta"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Verrà attivato il Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Reti utilizzabili in aereo"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cerca e collegati a reti utilizzabili in aereo"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aereo, utilizzabile in aereo"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chiamate e SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Chiamate Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Effettua e ricevi chiamate tramite reti non dell\'operatore, ad esempio Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Le chiamate Wi-Fi consentono di effettuare e ricevere chiamate tramite reti non dell\'operatore, ad esempio alcune reti Wi‑Fi.\n\nLe chiamate tramite SIM ti consentono di utilizzare i dati mobili di una SIM per effettuare e ricevere chiamate da e verso un\'altra SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chiamate"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1e1fca0..971e2f4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"דירוג אוטומטי של התראות לפי רלוונטיות"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"משוב להתראות מותאמות"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ציון התאמות שבוצעו בהתראות והצגת האפשרות לספק למערכת משוב"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"איפוס הגדרת החשיבות של התראות"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"איפוס הגדרות חשיבות שהמשתמש שינה ומתן הרשאה לאסיסטנט ההתראות לקביעת סדר עדיפויות"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"הצעות לפעולות ותשובות"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"הצגה אוטומטית של פעולות ותגובות מומלצות"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"הצגת התראות אחרונות והתראות שהועברו למצב נודניק"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"לא זמין כשהמכשיר מחובר ל-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"הצגת פריטים נוספים"</string>
<string name="see_less" msgid="2642392725363552793">"הצג פחות"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"להפעיל את <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"להפעיל SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"לעבור אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"להחליף לשימוש בכרטיס SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"רק כרטיס SIM אחד יכול להיות פעיל בכל רגע נתון.\n\nמעבר אל <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> לא יבטל את השירות של <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"בכל רגע נתון אפשר להשתמש רק בכרטיס SIM אחד שהורדת.\n\nמעבר אל <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> לא יבטל את השירות של <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"רק כרטיס SIM אחד יכול להיות פעיל בכל רגע נתון.\n\nהחלפת כרטיס לא תבטל את השירות של <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"מעבר אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"מתבצעת התחברות לרשת…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"מתבצע מעבר אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"לא ניתן להחליף את הספק"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"לא ניתן להחליף את הספק עקב שגיאה."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"לכבות את <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"לכבות את כרטיס ה-SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"מתבצע כיבוי של כרטיס ה-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"לא ניתן להשבית את הספק"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"לא ניתן להשבית את הספק"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"משהו השתבש ולא ניתן היה להשבית את הספק."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"להשתמש בשני כרטיסי SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"מכשיר זה יכול להכיל שני כרטיסי SIM פעילים בו-זמנית. כדי להמשיך להשתמש ב-SIM אחד בכל פעם, יש להקיש על \"לא תודה\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"להפעיל את המכשיר מחדש?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"כדי להתחיל, יש להפעיל את המכשיר מחדש. לאחר מכן, אפשר יהיה להוסיף עוד SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"המשך"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"הפעלה מחדש"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"לא תודה"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"מעבר"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"לא ניתן להפעיל את ה-SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"יש להוציא את ה-SIM ולהכניס אותו חזרה. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"יש להפעיל שוב את ה-SIM. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"למחוק את ה-SIM הזה שהורדת?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"מחיקת כרטיס ה-SIM הזה מסירה את השירות של <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> מהמכשיר הזה.\n\nהשירות של <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> לא יבוטל."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"מחיקה"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ה-Bluetooth יופעל"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"התכונה פועלת"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"התכונה כבויה"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"אינטרנט"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"כרטיסי SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"רשתות בטוחות לטיסה"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"חיפוש רשתות בטוחות לטיסה והתחברות אליהן"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"טיסה, בטוח לטיסה"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"שיחות והודעות SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"שיחות Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"התקשרות וקבלת שיחות באמצעות רשתות שאינן רשתות הספקים, כמו Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"התכונה שיחות Wi-Fi מאפשרת להתקשר ולקבל שיחות באמצעות רשתות שאינן רשתות הספקים, כמו רשתות Wi‑Fi מסוימות.\n\nהתכונה שיחות באמצעות כרטיסי SIM מאפשרת להפיק את המרב מחבילת הגלישה של כרטיס ה-SIM כדי להתקשר ולקבל שיחות מכרטיס SIM אחר."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"שיחות"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index af7ef06..8f00141 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"関連性を基準に通知のランキングを自動的に調整する"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"通知の自動調整に関するフィードバック"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"通知に加えた調整と、システムにフィードバックを提供するオプションが表示されます"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"重要度の設定をリセットする"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ユーザーが変更した重要度の設定をリセットして、通知アシスタントが優先度を設定できるようにします"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"操作や返信の候補"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"操作や返信の候補が自動的に表示されます"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"最近の通知とスヌーズに設定した通知を表示します"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> への接続時は利用できません"</string>
<string name="see_more" msgid="7499355691042812723">"詳細"</string>
<string name="see_less" msgid="2642392725363552793">"一部を表示"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> を ON にしますか？"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM を ON にしますか？"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えますか？"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM カードの使用に切り替えますか？"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM は一度に 1 つのみ有効にできます。\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> に切り替えても、<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> サービスが解約されることはありません。"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ダウンロード型 SIM は一度に 1 つのみ有効にできます。\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> に切り替えても、<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> サービスが解約されることはありません。"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM は一度に 1 つのみ有効にできます。\n\n切り替えても、<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> サービスが解約されることはありません。"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替え"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ネットワークに接続しています…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えています"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"携帯通信会社の切り替えエラー"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"エラーが発生したため、携帯通信会社を切り替えることができません。"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> を OFF にしますか？"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM を OFF にしますか？"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM を OFF にしています<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"携帯通信会社の無効化エラー"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"携帯通信会社の無効化エラー"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"エラーが発生したため、携帯通信会社を無効にできませんでした。"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 枚の SIM を使用しますか？"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"このデバイスでは同時に 2 枚の SIM を使用できます。引き続き 1 枚のみを使用するには、[いいえ] をタップしてください。"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"デバイスを再起動しますか？"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"まず、デバイスを再起動します。これで、別の SIM を追加できます。"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"続行"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"再起動"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"いいえ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"切り替える"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM を有効にできません"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM カードを取り出して、もう一度挿入してください。問題が解決しない場合は、デバイスを再起動してください。"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM をもう一度 ON にしてみてください。問題が解決しない場合は、デバイスを再起動してください。"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"このダウンロード型 SIM を消去しますか？"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"この SIM を消去すると、このデバイスから <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> サービスが削除されます。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> のサービスが解約されることはありません。"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"消去"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth が ON になります"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ON"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"OFF"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"インターネット"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"機内で利用できるネットワーク"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"機内で利用できるネットワークを検出して接続します"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"機内、機内で利用できる"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"通話と SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"携帯通信会社以外のネットワーク（Wi-Fi など）を利用して通話の発信と着信を行う"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi 通話では、携帯通信会社以外のネットワーク（一部の Wi-Fi ネットワークなど）を利用して通話の発信と着信を行えます。\n\nCross-SIM 通話では、SIM のモバイルデータを利用して別の SIM から通話の発信と着信を行えます。"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 35238ae..082a282 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"შეტყობინებების ავტომატური კლასიფიკაცია შესაბამისობის მიხედვით"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"შეტყობინებათა ადაპტირებადი გამოხმაურება"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"შეტყობინებათა დარეგულირების ცვლილებათა ასახვა და სისტემისთვის გამოხმაურების მიწოდების ვარიანტის ჩვენება"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"შეტყობინების მნიშვნელოვნობის გადაყენება"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"მომხმარებლის მიერ შეცვლილი მნიშვნელოვნობის პარამეტრების გადაყენება და შეტყობინებების ასისტენტის პრიორიტეტიზაციის დაშვება"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"შემოთავაზებული მოქმედებები და პასუხები"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"შემოთავაზებული მოქმედებების და პასუხების ავტომატურად ჩვენება"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ბოლო და ჩაჩუმებული შეტყობინებების ჩვენება"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"მიუწვდომელია, როცა დაკავშირებულია <xliff:g id="CARRIER">%1$s</xliff:g>-თან"</string>
<string name="see_more" msgid="7499355691042812723">"მეტის ნახვა"</string>
<string name="see_less" msgid="2642392725363552793">"ნაკლების ნახვა"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"გსურთ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ის ჩართვა?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"გსურთ SIM-ის ჩართვა?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"გსურთ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"გსურთ SIM ბარათის გამოყენებაზე გადართვა?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ყოველ ჯერზე მხოლოდ ერთი SIM ბარათი შეიძლება იყოს აქტიური.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ყოველ ჯერზე მხოლოდ ერთი ჩამოტვირთული SIM ბარათი შეიძლება იყოს აქტიური.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ყოველ ჯერზე მხოლოდ ერთი SIM ბარათი შეიძლება იყოს აქტიური.\n\nგადართვა <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"მიმდინარეობს ქსელთან დაკავშირება…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"მიმდინარეობს <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ოპერატორის გადართვა ვერ მოხერხდა"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ოპერატორის გადართვა ვერ მოხერხდა წარმოქმნილი შეცდომის გამო."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"გამოირთოს <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"გამოირთოს SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"მიმდინარეობს SIM-ის გამორთვა<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ოპერატორი ვერ გაითიშა"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ოპერატორი ვერ გაითიშა"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ოპერატორი ვერ გაითიშა წარმოქმნილი შეფერხების გამო."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"გამოიყენებთ 2 SIM ბარათს?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ამ მოწყობილობას შეუძლია ერთდროულად 2 SIM ბარათი ჰქონდეს აქტიური. იმისათვის, რომ განაგრძოთ ყოველ ჯერზე ერთი SIM ბარათის გამოყენება, შეეხეთ ტექსტს „არა, გმადლობთ“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"გსურთ მოწყობილობის გადატვირთვა?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"დასაწყებად გადატვირთეთ მოწყობილობა. ამის შემდეგ შეგიძლიათ დაამატოთ სხვა SIM ბარათი."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"გაგრძელება"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"გადატვირთვა"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"არა, გმადლობთ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"გადართვა"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM ბარათის გააქტიურება ვერ ხერხდება"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ამოიღეთ SIM ბარათი და მოათავსეთ ის ხელახლა. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ცადეთ, ხელახლა ჩართოთ SIM ბარათი. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ამოიშალოს ეს ჩამოტვირთული SIM ბარათი?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ამ SIM ბარათის ამოშლა მოწყობილობიდან <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-ის სერვისს ამოიღებს.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-ის სერვისი არ გაუქმდება."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ამოშლა"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ჩაირთვება Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ჩართულია"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"გამორთულია"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ინტერნეტი"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ები"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"თვითმფრინავისთვის უსაფრთხო ქსელები"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"იპოვეთ და დაუკავშირდით თვითმფრინავისთვის უსაფრთხო ქსელებს"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"თვითმფრინავი, თვითმფრინავისთვის უსაფრთხო"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ზარები და SMS-ები"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi დარეკვა"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"დარეკეთ და მიიღეთ ზარები არაოპერატორის ქსელების, მაგალითად, Wi-Fi ქსელის მეშვეობით"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi დარეკვა საშუალებას გაძლევთ, დარეკოთ და მიიღოთ ზარები არაოპერატორის ქსელების, მაგალითად, ზოგიერთი Wi-Fi ქსელის მეშვეობით.\n\nSIM-თაშორისი დარეკვა საშუალებას გაძლევთ, გამოიყენოთ ერთი SIM-ის მობილური ინტერნეტი სხვა SIM-ით დასარეკად ან ზარების მისაღებად."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ზარები"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index aaed3e4..396d63a 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -264,7 +264,7 @@
<item msgid="1249691739381713634">"дыбыс қаттылығы"</item>
<item msgid="6485000384018554920">"қоңыраудың дыбыс деңгейі"</item>
<item msgid="3378000878531336372">"мультимeдиа дыбыс деңгейі"</item>
- <item msgid="5272927168355895681">"дабыл дыбысының қаттылығы"</item>
+ <item msgid="5272927168355895681">"дабыл дыбысының деңгейі"</item>
<item msgid="4422070755065530548">"хабар дыбысының қаттылығы"</item>
<item msgid="3250654589277825306">"bluetooth дыбысының қаттылығы"</item>
<item msgid="4212187233638382465">"ұйқы бермеу"</item>
@@ -331,7 +331,7 @@
<item msgid="4722479281326245754">"Дыбыс қаттылығы"</item>
<item msgid="6749550886745567276">"Қоңыраудың дыбыс деңгейі"</item>
<item msgid="2218685029915863168">"Mультимeдиа дыбыс деңгейі"</item>
- <item msgid="4266577290496513640">"Дабыл дыбысының қаттылығы"</item>
+ <item msgid="4266577290496513640">"Дабыл дыбысының деңгейі"</item>
<item msgid="8608084169623998854">"Хабар дыбысының қаттылығы"</item>
<item msgid="7948784184567841794">"Bluetooth дыбысының қаттылығы"</item>
<item msgid="1148968792599973150">"Ұйқы бермеу"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 4969f94..0b6c900 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1646,7 +1646,7 @@
<string name="main_clear_progress_title" msgid="7239741132015617719">"Өшіріліп жатыр"</string>
<string name="main_clear_progress_text" msgid="4636695115176327972">"Күте тұрыңыз…"</string>
<string name="call_settings_title" msgid="2531072044177194164">"Қоңырау параметрлері"</string>
- <string name="call_settings_summary" msgid="8244293779053318053">"Дауыс хабары, қоңырауды басқа нөмірге бағыттау, күту және қоңырау шалушының жеке анықтағышын орнату"</string>
+ <string name="call_settings_summary" msgid="8244293779053318053">"Дауыстық пошта, қоңырауды басқа нөмірге бағыттау және ұстап тұру, қоңырау шалушыт нөмірлерді автоматты анықтау"</string>
<string name="tether_settings_title_usb" msgid="5926474044238409099">"USB тетеринг"</string>
<string name="tether_settings_title_wifi" msgid="4327056146425282159">"Алынбалы хот-спот"</string>
<string name="tether_settings_title_bluetooth" msgid="8878813702520141084">"Bluetooth модем"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды сәйкестігіне қарай сұрыптау"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Бейімделетін хабарландырулар туралы пікірлер"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Хабарландыруларға жасалған түзетулерді көрсетеді және жүйеге пікір жіберуді ұсынады"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Хабарландырулардың маңыздылық параметрлерін бастапқы күйге қайтару"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Пайдаланушы өзгерткен маңыздылық параметрлерін бастапқы күйге қайтарып, хабарландыру көмекшісінің басымдықты анықтауына рұқсат ету"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ұсынылған әрекеттер мен жауаптарды автоматты түрде көрсету"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Соңғы және кейінге қалған хабарландыруларды көрсету"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторына қосылып тұрғанда қолжетімді емес"</string>
<string name="see_more" msgid="7499355691042812723">"Басқаларын көру"</string>
<string name="see_less" msgid="2642392725363552793">"Азырақ көру"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметін қосасыз ба?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM картасын қосасыз ба?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысу қажет пе?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM картасы арқылы ауыстырасыз ба?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бір уақытта тек бір SIM картасын пайдалануға болады.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметіне ауыссаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> қызметінен бас тартылмайды."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Бір уақытта тек бір жүктеп алынған SIM картасын пайдалануға болады.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметіне ауыссаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> қызметінен бас тартылмайды."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бір уақытта тек бір SIM картасын пайдалануға болады. \n\nБасқа қызметке ауыссаңыз, <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметінен бас тартылмайды."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысу"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Желіге қосылуда…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысуда"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Оператор ауыстырылмады"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Қатеге байланысты оператор ауыстырылмады."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өшірілсін бе?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM картасы өшірілсін бе?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картасы өшірілуде<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Оператор өшірілмеді"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Оператор өшірілмеді"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бірдеңеден қате кетті де, оператор өшірілмеді."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM картасын пайдаланасыз ба?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Құрылғыда бір уақытта 2 SIM картасын пайдалануға болады. 1 SIM картасын пайдалану үшін \"Жоқ, рақмет\" түймесін түртіңіз."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Құрылғыны қайта қосасыз ба?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Бастау үшін құрылғыңызды қайта қосыңыз. Одан кейін басқа SIM картасын енгізе аласыз."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Жалғастыру"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Қайта қосу"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Жоқ, рақмет"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Ауысу"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картасын іске қосу мүмкін емес"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM картасын шығарып, қайта салыңыз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM картасын қайтадан қосып көріңіз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Бұл жүктеп алынған SIM картасы өшірілсін бе?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Бұл SIM картасының деректерін өшірсеңіз, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> қызметі бұл құрылғыдан жойылады.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> қызметінен бас тартылмайды."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Жою"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth қосылады."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Қосулы"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Өшірулі"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталары"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Ұшақта пайдалануға болатын желілер"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Ұшақта пайдалануға болатын желілерді тауып, қосылу"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ұшақ, ұшақта қолдануға болатын желі"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Қоңыраулар мен SMS хабарлары"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi қоңыраулары"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Операторыңыздан өзге желілер арқылы (мысалы, Wi‑Fi желісі сияқты) қоңырау шалу не қабылдау"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi қоңыраулары операторыңыздан өзге желілер арқылы (мысалы, кейбір Wi‑Fi желілері сияқты) қоңырау шалуға не қабылдауға мүмкіндік береді.\n\nSIM карталары арасында қоңырау шалу арқылы SIM картасының мобильдік интернет трафигін басқа SIM картасымен қоңырау алмасуға тиімді пайдалануға болады."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Қоңыраулар"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b9c9794..679af7d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ចាត់ថ្នាក់ការជូនដំណឹងតាមភាពពាក់ព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"មតិកែលម្អអំពីការជូនដំណឹងដែលមានភាពបត់បែន"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"បង្ហាញការកែតម្រូវដែលបានធ្វើឡើងចំពោះការជូនដំណឹង និងបង្ហាញជម្រើសក្នុងការផ្ដល់មតិកែលម្អទៅប្រព័ន្ធ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"កំណត់កម្រិតសំខាន់នៃការជូនដំណឹងឡើងវិញ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"កំណត់ឡើងវិញនូវការកំណត់កម្រិតសំខាន់ដែលផ្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់ រួចអនុញ្ញាតឱ្យជំនួយការជូនដំណឹងធ្វើការកំណត់អាទិភាព"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ការឆ្លើយតប និងសកម្មភាពដែលបានណែនាំ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"បង្ហាញការឆ្លើយតប និងសកម្មភាពដែលបានណែនាំដោយស្វ័យប្រវត្តិ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"បង្ហាញការជូនដំណឹងថ្មីៗ និងការជូនដំណឹងដែលបានផ្អាក"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"មិនអាចប្រើបានទេ នៅពេលភ្ជាប់ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"មើលច្រើនទៀត"</string>
<string name="see_less" msgid="2642392725363552793">"មើលតិចជាង"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"បើក <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"បើកស៊ីមឬ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ប្ដូរទៅប្រើស៊ីមកាតឬ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"អាចបើកដំណើរការស៊ីមម្តងមួយតែប៉ុណ្ណោះ។\n\nការប្ដូរទៅ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> នឹងមិនបោះបង់សេវាកម្ម <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> របស់អ្នកទេ។"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"អាចបើកដំណើរការស៊ីមដែលបានទាញយកម្ដងមួយតែប៉ុណ្ណោះ។\n\nការប្ដូរទៅ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> នឹងមិនបោះបង់សេវាកម្ម <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> របស់អ្នកទេ។"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"អាចបើកដំណើរការស៊ីមម្តងមួយតែប៉ុណ្ណោះ។\n\nការប្ដូរនឹងមិនបោះបង់សេវាកម្ម <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> របស់អ្នកទេ។"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"កំពុងភ្ជាប់បណ្ដាញ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"កំពុងប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"មិនអាចប្ដូរក្រុមហ៊ុនសេវាទូរសព្ទបានទេ"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"មិនអាចប្ដូរក្រុមហ៊ុនសេវាទូរសព្ទបានទេ ដោយសារមានបញ្ហា។"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"បិទ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"បិទស៊ីមឬ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"កំពុងបិទស៊ីម<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"មិនអាចបិទក្រុមហ៊ុនសេវាទូរសព្ទបានទេ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"មិនអាចបិទក្រុមហ៊ុនសេវាទូរសព្ទបានទេ"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"មានអ្វីមួយខុសប្រក្រតី ទើបមិនអាចបិទក្រុមហ៊ុនសេវាទូរសព្ទរបស់អ្នកបាន។"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ប្រើស៊ីម 2 ឬ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ឧបករណ៍នេះអាចដំណើរការស៊ីម 2 ក្នុងពេលតែមួយបាន។ ដើម្បីបន្តប្រើស៊ីម 1 ក្នុងមួយលើក សូមចុចពាក្យ \"ទេ អរគុណ\"។"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ចាប់ផ្ដើមឧបករណ៍ឡើងវិញឬ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ដើម្បីចាប់ផ្ដើម សូមចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ។ បន្ទាប់មកអ្នកអាចបញ្ចូលស៊ីមផ្សេងទៀតបាន។"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"បន្ត"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ចាប់ផ្ដើមឡើងវិញ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ទេ អរគុណ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ប៊ូតុងបិទបើក"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"មិនអាចបើកដំណើរការស៊ីមបានទេ"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"សូមដកស៊ីម រួចបញ្ចូលឡើងវិញ។ ប្រសិនបើនៅតែមានបញ្ហា សូមចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ។"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"សូមសាកល្បងបើកស៊ីមម្ដងទៀត។ ប្រសិនបើនៅតែមានបញ្ហា សូមចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ។"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"លុបស៊ីមដែលបានទាញយកនេះឬ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ការលុបស៊ីមនេះនឹងលុបសេវាកម្ម <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ពីឧបករណ៍នេះ។\n\nសេវាកម្មសម្រាប់ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> នឹងមិនត្រូវបានបោះបង់ទេ។"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"លុប"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ប៊្លូធូសនឹងបើក"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"បើក"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"បិទ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"អ៊ីនធឺណិត"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ស៊ីម"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"បណ្ដាញមានសុវត្ថិភាពពេលជិះយន្តហោះ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"រកមើល និងភ្ជាប់បណ្ដាញមានសុវត្ថិភាពពេលជិះយន្តហោះ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"យន្តហោះ មានសុវត្ថិភាពពេលជិះយន្តហោះ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ការហៅទូរសព្ទ និង SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ការហៅតាម Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ហៅ និងទទួលទូរសព្ទតាមបណ្ដាញដែលមិនមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទដូចជា Wi‑Fi ជាដើម"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ការហៅតាម Wi-Fi អនុញ្ញាតឱ្យអ្នកហៅ និងទទួលទូរសព្ទតាមបណ្ដាញដែលមិនមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទដូចជា បណ្ដាញ Wi‑Fi មួយចំនួនជាដើម។\n\nការហៅទូរសព្ទឆ្លងប្រព័ន្ធអនុញ្ញាតឱ្យអ្នកប្រើទិន្នន័យទូរសព្ទចល័តរបស់ស៊ីម ដើម្បីហៅ និងទទួលទូរសព្ទពីស៊ីមផ្សេងទៀត។"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ការហៅទូរសព្ទ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"សារ SMS"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 505e070..294a698 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1496,7 +1496,7 @@
<string name="storage_detail_system" msgid="3797439069473271732">"ಸಿಸ್ಟಂ"</string>
<string name="storage_detail_explore" msgid="13782374784415466">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್ಪ್ಲೋರ್ ಮಾಡಿ"</string>
<string name="storage_detail_dialog_other" msgid="3359851869961609901">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್ಗಳು, Android ಫೈಲ್ಗಳು ಹಾಗೂ ಮೊದಲಾದವುಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="NAME">^1</xliff:g>, ಎಕ್ಸ್ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
- <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ"</string>
+ <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್ಗಳು ಈ ಸಿಸ್ಟಂನಲ್ಲಿವೆ"</string>
<string name="storage_detail_dialog_user" msgid="1691219071007313226">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು <xliff:g id="SIZE">^2</xliff:g> ಸಂಗ್ರಹಣೆ ಬಳಸಿ ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಅಥವಾ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="USER_1">^1</xliff:g> ಗೆ ಬದಲಾಯಿಸಿ."</string>
<string name="storage_wizard_init_title" msgid="9036374223934708619">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="storage_wizard_init_external_title" msgid="6540132491909241713">"ಪೋರ್ಟಬಲ್ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
@@ -2711,7 +2711,7 @@
<string name="credentials_reset_hint" msgid="4054601857203464867">"ಎಲ್ಲ ವಿಷಯಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
<string name="credentials_erased" msgid="9121052044566053345">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ."</string>
<string name="credentials_not_erased" msgid="3611058412683184031">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
- <string name="usage_access_title" msgid="1580006124578134850">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್"</string>
+ <string name="usage_access_title" msgid="1580006124578134850">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆ್ಯಪ್"</string>
<string name="ca_certificate" msgid="3076484307693855611">"CA ಪ್ರಮಾಣಪತ್ರ"</string>
<string name="user_certificate" msgid="6897024598058566466">"VPN ಮತ್ತು ಆ್ಯಪ್ ಬಳಕೆದಾರರ ಪ್ರಮಾಣಪತ್ರ"</string>
<string name="wifi_certificate" msgid="8461905432409380387">"ವೈ-ಫೈ ಪ್ರಮಾಣಪತ್ರ"</string>
@@ -2737,7 +2737,7 @@
<string name="backup_inactive_title" msgid="6753265378043349277">"ಬ್ಯಾಕ್ಅಪ್ ಸೇವೆ ಸಕ್ರಿಯವಾಗಿಲ್ಲ"</string>
<string name="backup_configure_account_default_summary" msgid="5323225330966306690">"ಬ್ಯಾಕ್ ಅಪ್ ಆಗಿರುವ ಡೇಟಾವನ್ನು ಯಾವುದೇ ಖಾತೆಯು ಪ್ರಸ್ತುತ ಸಂಗ್ರಹಿಸುತ್ತಿಲ್ಲ"</string>
<string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
- <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ನಿಮ್ಮ Wi‑Fi ಪಾಸ್ವರ್ಡ್ಗಳು, ಬುಕ್ಮಾರ್ಕ್ಗಳು ಇತರ ಸೆಟ್ಟಿಂಗ್ಗಳು ಹಾಗೂ ಆಪ್ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದರ ಜೊತೆಗೆ Google ಸರ್ವರ್ಗಳಲ್ಲಿನ ಎಲ್ಲ ಪ್ರತಿಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
+ <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ನಿಮ್ಮ Wi‑Fi ಪಾಸ್ವರ್ಡ್ಗಳು, ಬುಕ್ಮಾರ್ಕ್ಗಳು ಇತರ ಸೆಟ್ಟಿಂಗ್ಗಳು ಹಾಗೂ ಆ್ಯಪ್ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದರ ಜೊತೆಗೆ Google ಸರ್ವರ್ಗಳಲ್ಲಿನ ಎಲ್ಲ ಪ್ರತಿಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
<string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್ವರ್ಡ್ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹ) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಫೈಲ್ಗಳಂತಹ) ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದೇ ಹಾಗೂ ರಿಮೋಟ್ ಸರ್ವರ್ಗಳಲ್ಲಿರುವ ಎಲ್ಲಾ ನಕಲುಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
<string name="fullbackup_data_summary" msgid="971587401251601473">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್ವರ್ಡ್ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹವು) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಫೈಲ್ಗಳಂತಹವು) ರಿಮೋಟ್ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ.\n\nನೀವು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ಸಾಧನ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ರಿಮೋಟ್ ಮೂಲಕ ನಿಯತಕಾಲಿಕವಾಗಿ ಉಳಿಸಲಾಗುವುದು. ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಎಂದರೆ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಉಳಿಸಲಾಗಿರುವ (ಡೆವಲಪರ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಆಧರಿಸಿ) ಯಾವುದೇ ಡೇಟಾ ಆಗಿರಬಹುದು. ಇದು ಸಂಪರ್ಕಗಳು, ಸಂದೇಶಗಳು ಮತ್ತು ಫೋಟೋಗಳಂತಹ ಸಂಭವನೀಯ ಸೂಕ್ಷ್ಮ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
<string name="device_admin_settings_title" msgid="31392408594557070">"ಸಾಧನದ ನಿರ್ವಾಹಕರ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
@@ -3326,7 +3326,7 @@
<string name="media_volume_option_title" msgid="5966569685119475630">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</string>
<string name="remote_media_volume_option_title" msgid="8760846743943305764">"ವಾಲ್ಯೂಮ್ ಕ್ಯಾಸ್ಟ್ ಮಾಡಿ"</string>
<string name="call_volume_option_title" msgid="1461105986437268924">"ಕರೆಯ ವಾಲ್ಯೂಮ್"</string>
- <string name="alarm_volume_option_title" msgid="6398641749273697140">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string>
+ <string name="alarm_volume_option_title" msgid="6398641749273697140">"ಅಲಾರಂ ವಾಲ್ಯೂಮ್"</string>
<string name="ring_volume_option_title" msgid="1520802026403038560">"ರಿಂಗ್ ಮತ್ತು ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
<string name="notification_volume_option_title" msgid="4838818791683615978">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
<string name="ringtone_title" msgid="3271453110387368088">"ಫೋನ್ ರಿಂಗ್ಟೋನ್"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ಪ್ರಸ್ತುತತೆಯಿಂದ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಧಿಸೂಚನೆಗಳಿಗೆ ದರ್ಜೆ ನೀಡಿ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ಅಡಾಪ್ಟಿವ್ ಅಧಿಸೂಚನೆಯ ಪ್ರತಿಕ್ರಿಯೆ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ಅಧಿಸೂಚನೆಗಳಿಗೆ ಮಾಡಿದ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ಸೂಚಿಸಿ ಮತ್ತು ಸಿಸ್ಟಂಗೆ ಪ್ರತಿಕ್ರಿಯೆ ಒದಗಿಸುವ ಆಯ್ಕೆಯನ್ನು ತೋರಿಸಿ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"ಅಧಿಸೂಚನೆ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ಬಳಕೆದಾರರು ಬದಲಾಯಿಸಿದ ಪ್ರಮುಖ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ ಮತ್ತು ಅಧಿಸೂಚನೆ ಸಹಾಯಕಕ್ಕೆ ಆದ್ಯತೆ ನೀಡಲು ಅನುಮತಿಸಿ"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ಸೂಚಿಸಲಾಗಿರುವ ಕ್ರಿಯೆಗಳು ಮತ್ತು ಪ್ರತ್ಯುತ್ತರಗಳು"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ಸಲಹೆ ಮಾಡಿರುವ ಕ್ರಿಯೆಗಳು & ಪ್ರತ್ಯುತ್ತರಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೋರಿಸಿ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ಇತ್ತೀಚಿನ ಮತ್ತು ಸ್ನೂಜ್ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string>
@@ -3973,7 +3975,7 @@
<string name="advanced_apps" msgid="7643010673326578815">"ಸುಧಾರಿತ"</string>
<string name="configure_apps" msgid="5468359087126598115">"ಅಪ್ಲಿಕೇಶನ್ ಕಾನ್ಫಿಗರ್"</string>
<string name="unknown_app" msgid="2027248925719898714">"ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್"</string>
- <string name="app_permissions" msgid="8666537659217653626">"ಅನುಮತಿ ನಿರ್ವಾಹಕರು"</string>
+ <string name="app_permissions" msgid="8666537659217653626">"ಅನುಮತಿ ನಿರ್ವಾಹಕ"</string>
<string name="app_permissions_summary" msgid="2709819220672938860">"<xliff:g id="APPS">%1$s</xliff:g> ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
<string name="app_permissions_summary_more" msgid="6247952473615352350">"ಆ್ಯಪ್ಗಳು <xliff:g id="APPS">%1$s</xliff:g> ಮತ್ತು ಇನ್ನಷ್ಟನ್ನು ಬಳಸುತ್ತಿವೆ"</string>
<string name="tap_to_wake" msgid="3313433536261440068">"ಎಚ್ಚರಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ತುರ್ತು SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ಪವರ್ ಬಟನ್ ಅನ್ನು ತ್ವರಿತವಾಗಿ 5 ಬಾರಿ ಒತ್ತುವ ಮೂಲಕ ತುರ್ತು SOS ಆ್ಯಕ್ಷನ್ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ."</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"ಎಚ್ಚರಿಕೆಯ ಶಬ್ದ"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ಆ್ಯಕ್ಷನ್ಗಳನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ಎಚ್ಚರಿಕೆ ನೀಡಿ"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ನು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
<string name="see_more" msgid="7499355691042812723">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
<string name="see_less" msgid="2642392725363552793">"ಕಡಿಮೆ ನೋಡಿ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ಬಳಸುತ್ತಿರುವ ಸಿಮ್ ಕಾರ್ಡ್ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಡೌನ್ಲೋಡ್ ಮಾಡಿದ SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಸಿಮ್ ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\nಸಿಮ್ಗಳನ್ನು ಬದಲಿಸುವುದರಿಂದ ನಿಮ್ಮ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಿ"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ನೆಟ್ವರ್ಕ್ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ದೋಷವೊಂದರ ಕಾರಣದಿಂದಾಗಿ ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ವಾಹಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ಏನೋ ತಪ್ಪಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ಸಿಮ್ಗಳನ್ನು ಬಳಸಬೇಕೇ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ಈ ಸಾಧನವು ಒಂದೇ ಬಾರಿಗೆ 2 ಸಕ್ರಿಯ ಸಿಮ್ಗಳನ್ನು ಹೊಂದಿರಬಹುದು. ಒಂದು ಬಾರಿಗೆ 1 ಸಿಮ್ ಬಳಸುವುದನ್ನು ಮುಂದುವರಿಸಲು \"ಧನ್ಯವಾದಗಳು\" ಎಂಬುದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೇ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ. ನಂತರ ನೀವು ಮತ್ತೊಂದು ಸಿಮ್ ಅನ್ನು ಸೇರಿಸಬಹುದು."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ಮುಂದುವರಿಸಿ"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ಧನ್ಯವಾದಗಳು"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ಬದಲಿಸಿ"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ಸಿಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ಸಿಮ್ ಅನ್ನು ಮತ್ತೆ ಆನ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ಡೌನ್ಲೋಡ್ ಮಾಡಿದ ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದೇ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದರಿಂದ, ಅದು ಈ ಸಾಧನದಿಂದ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ಸೇವೆಯನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ಗಾಗಿ ಇರುವ ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ಅಳಿಸಿ"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗುತ್ತದೆ"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ಆನ್ ಆಗಿದೆ"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ಆಫ್ ಆಗಿದೆ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ಇಂಟರ್ನೆಟ್"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ಸಿಮ್ಗಳು"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ಏರ್ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ ನೆಟ್ವರ್ಕ್ಗಳು"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ಏರ್ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಹುಡುಕಿ ಮತ್ತು ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ಏರ್ಪ್ಲೇನ್, ಏರ್ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ಕರೆಗಳು & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ವೈ-ಫೈ ರೀತಿಯ ವಾಹಕ-ರಹಿತ ನೆಟ್ವರ್ಕ್ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ವೈ-ಫೈ ಕರೆಮಾಡುವಿಕೆಯು, ಕೆಲವು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ವಾಹಕ-ರಹಿತ ನೆಟ್ವರ್ಕ್ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ.\n\nಕ್ರಾಸ್-ಸಿಮ್ ಕರೆ ಮಾಡುವಿಕೆಯು, ಸಿಮ್ನ ಮೊಬೈಲ್ ಡೇಟಾವನ್ನು ಬಳಸಿಕೊಂಡು ಮತ್ತೊಂದು ಸಿಮ್ನಿಂದ ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ಕರೆಗಳು"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8801819..179e10d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"관련성에 따라 자동으로 알림 순위 지정"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"적응형 알림 의견"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"알림의 수정사항을 표시하며 시스템에 의견을 제공하는 옵션을 보여줍니다."</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"알림 중요도 재설정"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"사용자가 변경한 중요도 설정을 재설정하고 알림 어시스턴트가 우선순위를 지정하도록 허용합니다."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"추천 작업 및 답장"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"추천 작업 및 답장을 자동으로 표시"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"최근 알림 및 일시 중지된 알림 표시"</string>
@@ -3670,8 +3672,8 @@
<item quantity="other">앱 <xliff:g id="COUNT_1">%d</xliff:g>개 연결됨</item>
<item quantity="one">앱 <xliff:g id="COUNT_0">%d</xliff:g>개 연결됨</item>
</plurals>
- <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"이 앱을 연결하려면 직장 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요."</string>
- <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"이 앱을 연결하려면 개인 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요."</string>
+ <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"이 앱을 연결하려면 직장 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요"</string>
+ <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"이 앱을 연결하려면 개인 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요"</string>
<string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"탭하여 앱을 다운로드하세요."</string>
<string name="manage_zen_access_title" msgid="1562322900340107269">"방해 금지 모드 액세스"</string>
<string name="zen_access_detail_switch" msgid="4183681772666138993">"방해 금지 모드 허용"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>에 연결된 경우 사용할 수 없음"</string>
<string name="see_more" msgid="7499355691042812723">"더보기"</string>
<string name="see_less" msgid="2642392725363552793">"간략히 보기"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스를 사용하시겠습니까?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM을 사용 설정하시겠습니까?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환하시겠습니까?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM 카드 사용으로 전환하시겠습니까?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"다운로드한 SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\nSIM을 전환해도 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"네트워크에 연결 중…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환하는 중"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"이동통신사를 전환할 수 없음"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"오류로 인해 이동통신사를 전환할 수 없습니다."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>을(를) 사용 중지하시겠습니까?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM을 사용 중지하시겠습니까?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM을 사용 중지하는 중<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"이동통신사를 사용 중지할 수 없음"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"이동통신사를 사용 중지할 수 없음"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"문제가 발생하여 이동통신사를 사용 중지하지 못했습니다."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2개의 SIM을 사용하시겠습니까?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"이 기기에서는 한 번에 2개의 SIM을 활성화할 수 있습니다. 계속해서 한 번에 1개의 SIM만 사용하려면 \'사용 안함\'을 탭하세요."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"기기를 다시 시작하시겠습니까?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"시작하려면 기기를 다시 시작하세요. 그런 다음 다른 SIM을 추가할 수 있습니다."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"계속"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"다시 시작"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"취소"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"전환"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM을 활성화할 수 없음"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM을 삭제하고 다시 삽입해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM을 다시 사용 설정해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"다운로드한 SIM을 삭제하시겠습니까?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"이 SIM을 삭제하면 기기에서 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 서비스가 삭제됩니다.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"삭제"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"블루투스를 사용 설정함"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"사용"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"사용 안함"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"인터넷"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"항공 안전 네트워크"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"항공 안전 네트워크를 찾아 연결합니다."</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"항공, 항공 안전"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"통화 및 SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 통화"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi‑Fi와 같은 비이동통신사 네트워크를 통해 전화를 주고받습니다."</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi 통화를 사용하면 Wi‑Fi 네트워크와 같은 비이동통신사 네트워크를 통해 전화를 주고받을 수 있습니다.\n\nCross SIM 통화를 사용하면 SIM의 모바일 데이터를 활용하여 다른 SIM과 전화를 주고받을 수 있습니다."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"통화"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3e56dcd..c7274d1 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1614,7 +1614,7 @@
<string name="reset_esim_title" msgid="6152167073280852849">"Жүктөп алган SIM’дерди өчүрүү"</string>
<string name="reset_esim_desc" msgid="4256518544336245086">"Ордуна башка SIM карта жүктөп алуу үчүн, операторуңуз менен байланышыңыз. Тарифтик пландарыңыз өзгөрбөйт."</string>
<string name="reset_network_button_text" msgid="2281476496459610071">"Жөндөөлөрдү кайра коюу"</string>
- <string name="reset_network_final_desc" msgid="5304365082065278425">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз."</string>
+ <string name="reset_network_final_desc" msgid="5304365082065278425">"Тармак жөндөөлөрүн баштапкы абалга келтирсеңиз, аларды артка кайтара албайсыз. Уланта бересизби?"</string>
<string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Тармак жөндөөлөрүнүн баарын баштапкы абалга келтирип, жүктөлүп алынган SIM карталарды өчүрөсүзбү? Бул аракетти артка кайтара албайсыз."</string>
<string name="reset_network_final_button_text" msgid="2433867118414000462">"Жөндөөлөрдү кайра коюу"</string>
<string name="reset_network_confirm_title" msgid="913014422184481270">"Кайра коесузбу?"</string>
@@ -1834,7 +1834,7 @@
<string name="lockpassword_invalid_password" msgid="1588184930542221687">"Сырсөз туура эмес"</string>
<string name="lockpattern_need_to_unlock_wrong" msgid="8109305107409924083">"Үлгү туура эмес"</string>
<string name="lock_settings_title" msgid="665707559508132349">"Түзмөктүн коопсуздугу"</string>
- <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
+ <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Графикалык ачкычты өзгөртүү"</string>
<string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Кулпуну ачуу PIN кодун өзгөртүү"</string>
<string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Кулпуну ачуучу графикалык ачкычты тартыңыз"</string>
<string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Жардам үчүн Менюну басыңыз."</string>
@@ -1847,7 +1847,7 @@
<string name="lockpattern_restart_button_text" msgid="255339375151895998">"Кайра тартам"</string>
<string name="lockpattern_retry_button_text" msgid="4229668933251849760">"Тазалоо"</string>
<string name="lockpattern_continue_button_text" msgid="5253269556259503537">"Улантуу"</string>
- <string name="lockpattern_settings_title" msgid="9223165804553269083">"Кулпуну ачуу үлгүсү"</string>
+ <string name="lockpattern_settings_title" msgid="9223165804553269083">"Графикалык ачкыч"</string>
<string name="lockpattern_settings_enable_title" msgid="7401197111303283723">"Үлгү талап кылынсын"</string>
<string name="lockpattern_settings_enable_summary" msgid="1116467204475387886">"Экран кулпусун ачуу үчүн сүрөт үлгүсү тартылышы керек"</string>
<string name="lockpattern_settings_enable_visible_pattern_title" msgid="3340969054395584754">"Үлгүнү көрсөтүү"</string>
@@ -1855,9 +1855,9 @@
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="2273374883831956787">"Таптаганда дирилдесин"</string>
<string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="1638619728773344099">"Кубат баскычы дароо кулпулайт"</string>
<string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="2202430156268094229">"Кулпуланбаган экран <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматында колдоого алынбаса"</string>
- <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Кулпуну ачуу үлгүсүн коюу"</string>
- <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
- <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Кулпуну ачуу үлгүсүн кантип тартыш керек"</string>
+ <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Графикалык ачкычты коюу"</string>
+ <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Графикалык ачкычты өзгөртүү"</string>
+ <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Графикалык ачкычты кантип тартыш керек"</string>
<string name="lockpattern_too_many_failed_confirmation_attempts" msgid="7891484005551794824">"Туура эмес аракеттер өтө көп болду. <xliff:g id="NUMBER">%d</xliff:g> секунддан кийин кайталап көрүңүз."</string>
<string name="activity_not_found" msgid="5464331414465894254">"Колдонмо сиздин телефонуңузда орнотулган эмес."</string>
<string name="lock_settings_profile_title" msgid="103605580492566086">"Жумуш профилинин коопсуздугу"</string>
@@ -2808,7 +2808,7 @@
<string name="header_data_and_synchronization" msgid="453920312552838939">"Дайын-даректер жана шайкештирүү"</string>
<string name="preference_change_password_title" msgid="5465821666939825972">"Сызсөздү өзгөртүү"</string>
<string name="header_account_settings" msgid="1189339410278750008">"Аккаунттун жөндөөлөрү"</string>
- <string name="remove_account_label" msgid="4169490568375358010">"Аккаунтту алып салуу"</string>
+ <string name="remove_account_label" msgid="4169490568375358010">"Аккаунтту өчүрүү"</string>
<string name="header_add_an_account" msgid="3919151542338822661">"Аккаунт кошуу"</string>
<string name="really_remove_account_title" msgid="253097435885652310">"Аккаунтту өчүрөсүзбү?"</string>
<string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Бул аккаунтту өчүрсөңүз, планшеттеги бардык билдирүүлөр, байланыштар жана башка маалыматтар жок болот!"</string>
@@ -3056,9 +3056,9 @@
<string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Жумуш профили алынып салынсынбы?"</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"Сиз бул телефондогу мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
- <string name="user_confirm_remove_message" msgid="362545924965977597">"Бардык колдонмолор жана дайындар жоголот."</string>
+ <string name="user_confirm_remove_message" msgid="362545924965977597">"Бардык колдонмолор жана алардагы нерселер жоголот."</string>
<string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"Эгер улантсаңыз бул профилдеги колдонмолор менен дайындардын баары өчүрүлөт."</string>
- <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"Бардык колдонмолор жана дайындар жоголот."</string>
+ <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"Бардык колдонмолор жана алардагы нерселер жоголот."</string>
<string name="user_adding_new_user" msgid="7439602720177181412">"Жаңы колдонуучу кошулууда…"</string>
<string name="user_delete_user_description" msgid="7764153465503821011">"Колдонуучуну жок кылуу"</string>
<string name="user_delete_button" msgid="3833498650182594653">"Жок кылуу"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Билдирмелерди ылайыктуулугу боюнча автоматтык түрдө иреттөө"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Ыңгайлаштырылуучу билдирмелер жөнүндө пикир билдирүү"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Билдирмелерге киргизилген тууралоолорду жана тутумга пикир билдирүү опциясын көрсөтүү"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Маанилүүлүк жөндөөлөрүн баштапкы абалга келтирүү"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Колдонуучу өзгөрткөн маанилүүлүк жөндөөлөрүн баштапкы абалга келтирип, билдирмелер жардамчысына маанилүүлөрдү аныктоого уруксат бересиз"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Сунушталган аракеттер жана жооптор"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Сунушталган аракеттер менен жооптор автоматтык түрдө көрүнөт"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Акыркы жана тындырылган билдирмелер көрүнөт"</string>
@@ -3575,7 +3577,7 @@
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Жазышуу бөлүмүнүн үстүндө жана калкып чыкма билдирмелер түрүндө көрүнөт"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Жазышуулар тизмесинин үстүндө көрүнөт"</string>
<string name="other_conversations" msgid="551178916855139870">"Маанилүү эмес жазышуулар"</string>
- <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөртүү киргизилген жазышуулар"</string>
+ <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөрүү киргизилген жазышуулар"</string>
<string name="recent_conversations" msgid="471678228756995274">"Акыркы жазышуулар"</string>
<string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Акыркыларды тазалоо"</string>
<string name="clear" msgid="5092178335409471100">"Тазалоо"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна туташып турганда жеткиликсиз"</string>
<string name="see_more" msgid="7499355691042812723">"Дагы көрүү"</string>
<string name="see_less" msgid="2642392725363552793">"Азыраак көрүү"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> күйгүзүлсүнбү?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM-карта күйгүзүлсүнбү?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулсунбу?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-картаны колдонууга которуласызбы?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Бир учурда бир гана жүктөлүп алынган SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\nБашка SIM-картага которулсаңыз, <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулуу"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Байланыш операторуна туташууда…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулууда"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Байланыш оператору которуштурулбай жатат"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Катадан улам байланыш оператору которуштурулбай жатат."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өчүрүлсүнбү?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-карта өчүрүлсүнбү?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-карта өчүрүлүүдө<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Байланыш оператору өчүрүлгөн жок"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Байланыш оператору өчүрүлгөн жок"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бир жерден ката кетти, байланыш операторуңуз өчүрүлгөн жок."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM-картаны колдоносузбу?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Бул түзмөктө бир эле убакта 2 SIM-картаны иштетүүгө болот. Бир эле убакта 1 SIM-картаны гана колдонуу үчүн \"Жок, рахмат\" баскычын таптап коюңуз."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Түзмөк өчүп күйсүнбү?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Баштоо үчүн түзмөктү өчүрүп күйгүзүңүз. Андан соң башка SIM-картаны кошсоңуз болот."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Улантуу"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Өчүрүп күйгүзүү"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Жок, рахмат"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Которулуу"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-карта иштетилген жок"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-картаны чыгарып, кайра салыңыз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-картаны кайра күйгүзүп көрүңүз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Бул жүктөлүп алынган SIM картадагы маалыматты тазалайсызбы?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Бул SIM картадагы маалыматты тазаласаңыз, түзмөктү <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> байланыш оператору тейлебей калат. Бирок \n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> байланыш операторунун тарифтик планы мурунку бойдон эле калат."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Тазалоо"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth күйгүзүлөт"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Күйүк"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Өчүк"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталар"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Учак режимине ылайыктуу тармактар"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Учак режимине ылайыктуу тармактарды таап, туташыңыз"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"учак, учак режимине ылайыктуу"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Телефон чалуу жана SMS жөнөтүү"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi аркылуу чалуу"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Мобилдик байланыш эмес, Wi‑Fi тармагы сыяктуу байланыш аркылуу чалып, чалууларга жооп бериңиз"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi аркылуу чалуу менен мобилдик байланыш оператору аркылуу эмес, айрым Wi‑Fi тармактарын колдонуп чала аласыз.\n\nSIM-карталарды которуштуруп чалуу менен бир SIM-картадагы мобилдик трафикти үнөмдөп, башка SIM-карта менен чалып, чалууларга жооп бере аласыз."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Чалуулар"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 812e020..71bae71 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ຈັດອັນດັບການແຈ້ງເຕືອນຕາມຄວາມກ່ຽວຂ້ອງ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ຄຳຕິຊົມການແຈ້ງເຕືອນແບບປັບຕົວໄດ້"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ຊີ້ບອກການປັບແຕ່ງທີ່ເກີດຂຶ້ນກັບການແຈ້ງເຕືອນ ແລະ ສະແດງຕົວເລືອກເພື່ອສົ່ງຄຳຕິຊົມຫາລະບົບ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"ຣີເຊັດຄວາມສຳຄັນການແຈ້ງເຕືອນ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ຣີເຊັດການຕັ້ງຄ່າຄວາມສຳຄັນທີ່ຜູ້ໃຊ້ເປັນຄົນປ່ຽນ ແລະ ອະນຸຍາດຜູ້ຊ່ວຍການແຈ້ງເຕືອນໃຫ້ຕັ້ງຄວາມສຳຄັນໄດ້"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ສະແດງຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳໂດຍອັດຕະໂນມັດ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ສະແດງການແຈ້ງເຕືອນຫຼ້າສຸດ ແລະ ການແຈ້ງເຕືອນທີ່ເລື່ອນໄປແລ້ວ"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ບໍ່ສາມາດໃຊ້ໄດ້ເມື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"ເບິ່ງເພີ່ມເຕີມ"</string>
<string name="see_less" msgid="2642392725363552793">"ເບິ່ງໜ້ອຍລົງ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ເປີດໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ບໍ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ເປີດໃຊ້ຊິມບໍ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ສະຫຼັບໄປໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ບໍ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ສະຫຼັບໄປໃຊ້ຊິມກາດບໍ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ສາມາດເປີດໃຊ້ເທື່ອລະຊິມເທົ່ານັ້ນ.\n\nການສະຫຼັບໄປໃຊ້ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ຂອງທ່ານ."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ສາມາດເປີດໃຊ້ຊິມທີ່ດາວໂຫລດມາແລ້ວເທື່ອລະອັນເທົ່ານັ້ນ.\n\nການສະຫຼັບໄປໃຊ້ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ຂອງທ່ານ."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ສາມາດເປີດໃຊ້ໄດ້ເທື່ອລະຊິມເທົ່ານັ້ນ.\n\nການສະຫຼັບຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຂອງທ່ານ."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ສະຫຼັບໄປ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ກຳລັງເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"ກຳລັງສຳຫຼັບໄປ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ບໍ່ສາມາດສະຫຼັບຜູ້ໃຫ້ບໍລິການໄດ້"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ບໍ່ສາມາດສະຫຼັບຜູ້ໃຫ້ບໍລິການໄດ້ເນື່ອງຈາກເກີດຄວາມຜິດພາດຂຶ້ນ."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ປິດ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ໄວ້ບໍ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ປິດ SIM ບໍ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ກຳລັງປິດ SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ບໍ່ສາມາດປິດການຳໃຊ້ຜູ້ໃຫ້ບໍລິການ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ບໍ່ສາມາດປິດການນຳໃຊ້ຜູ້ໃຫ້ບໍລິການໄດ້"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ ແລະ ບໍ່ສາມາດປິດການນຳໃຊ້ຜູ້ໃຫ້ບໍລິການຂອງທ່ານໄດ້."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ໃຊ້ 2 ຊິມບໍ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ອຸປະກອນນີ້ສາມາດເປີດໃຊ້ 2 ຊິມໄດ້ພ້ອມກັນ. ເພື່ອດຳເນີນການຕໍ່ໂດຍໃຊ້ເທື່ອລະຊິມ, ໃຫ້ແຕະໃສ່ \"ບໍ່, ຂອບໃຈ\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ເພື່ອເລີ່ມຕົ້ນ, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານກ່ອນ. ຈາກນັ້ນທ່ານສາມາດເພີ່ມຊິມອື່ນໃສ່ໄດ້."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ສືບຕໍ່"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ຣີສະຕາດ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ບໍ່, ຂອບໃຈ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ສະຫຼັບ"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ບໍ່ສາມາດເປີດນຳໃຊ້ຊິມໄດ້"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ກະລຸນາຖອດຊິມອອກແລ້ວໃສ່ເຂົ້າໄປໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ໃຫ້ລອງເປີດຊິມຄືນໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ລຶບ SIM ທີ່ດາວໂຫລດມາແລ້ວນີ້ອອກບໍ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ການລຶບ SIM ນີ້ຈະລຶບບໍລິການ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ອອກຈາກອຸປະກອນນີ້.\n\nຈະບໍ່ຍົກເລີກບໍລິການສຳລັບ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ລຶບ"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ຈະເປີດ"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ເປີດ"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ປິດ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ອິນເຕີເນັດ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ເຄືອຂ່າຍທີ່ປອດໄພກັບຍົນ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ຊອກຫາ ແລະ ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍທີ່ປອດໄພກັບຍົນ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ຍົນ, ປອດໄພກັບຍົນ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ການໂທ ແລະ SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ການໂທ Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການ ເຊັ່ນ: Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ການໂທ Wi-Fi ຈະເຮັດໃຫ້ທ່ານສາມາດໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການໄດ້ ເຊັ່ນ: ເຄືອຂ່າຍ Wi‑Fi ບາງບ່ອນ.\n\nການໂທຂ້າມ SIM ຈະເຮັດໃຫ້ທ່ານສາມາດໃຊ້ອິນເຕີເນັດມືຖືຈາກ SIM ເພື່ອໂທ ແລະ ຮັບສາຍຈາກ SIM ອື່ນໄດ້."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ການໂທ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8ca5dc6..9041965 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatiškai reitinguoti pranešimus pagal atitikimą"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsiliepimai apie adaptyviuosius pranešimus"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Nurodyti pranešimų koregavimus ir rodyti parinktį teikti atsiliepimus apie sistemą"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Iš naujo nustatyti pranešimų svarbą"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Iš naujo nustatykite naudotojo pakeistus svarbos nustatymus ir leiskite pranešimų pagelbikliui priskirti prioritetą"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Siūlomi veiksmai ir atsakymai"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatiškai rodyti siūlomus veiksmus ir atsakymus"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Naujausių ir atidėtų pranešimų rodymas"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nepasiekiama, kai prisijungta prie „<xliff:g id="CARRIER">%1$s</xliff:g>“"</string>
<string name="see_more" msgid="7499355691042812723">"Žr. daugiau"</string>
<string name="see_less" msgid="2642392725363552793">"Žr. mažiau"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Įjungti „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Įjungti SIM kortelę?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Perjungti į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Perjungti į SIM kortelę?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vienu metu gali būti aktyvi tik viena SIM kortelė.\n\nPerjungus į „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ jums teikiamos „<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vienu metu gali būti aktyvi tik viena atsisiųsta SIM kortelė.\n\nPerjungus į „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ jums teikiamos „<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vienu metu gali būti aktyvi tik viena SIM kortelė.\n\nPerjungus jums teikiamos „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Perjungti į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Prisijungiama prie tinklo…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Perjungiama į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nepavyksta perjungti operatoriaus"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nepavyksta perjungti operatoriaus dėl klaidos."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Išjungti „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Išjungti SIM kortelę?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Išjungiama SIM kortelė<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nepavyksta išjungti operatoriaus"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nepavyksta išjungti operatoriaus"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kažkas nepavyko, todėl operatorius nebuvo išjungtas."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Naudoti dvi SIM korteles?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Šiame įrenginyje vienu metu gali būti dvi aktyvios SIM kortelės. Jei norite toliau naudoti vieną SIM kortelę vienu metu, palieskite „Ne, ačiū“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Paleisti įrenginį iš naujo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Kad galėtumėte pradėti, paleiskite įrenginį iš naujo. Tada galėsite pridėti kitą SIM kortelę."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Tęsti"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Paleisti iš naujo"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, ačiū"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Perjungti"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nepavyko suaktyvinti SIM kortelės"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Išimkite SIM kortelę ir vėl įdėkite. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pabandykite vėl įjungti SIM kortelę. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Ištrinti šią atsisiųstą SIM kortelę?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ištrynus šią SIM kortelę bus pašalintos „<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>“ paslaugos iš šio įrenginio.\n\n„<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>“ paslaugos nebus atšauktos."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ištrinti"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bus įjungtas „Bluetooth“"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Įjungta"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Išjungta"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internetas"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Tinklai, kuriais saugu naudotis lėktuvuose"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Raskite tinklų, kuriais saugu naudotis lėktuvuose, ir prisijunkite prie jų"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lėktuvas, saugu naudoti lėktuvuose"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Skambučiai ir SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"„Wi‑Fi“ skambučiai"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Atlikite ir gaukite skambučius ne operatoriaus tinklais, pvz., „Wi‑Fi“"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Naudodami „Wi-Fi“ skambinimą galite atlikti ir gauti skambučius ne operatoriaus tinklais, pvz., kai kuriais „Wi‑Fi“ tinklais.\n\nNaudodami skambinimą per SIM korteles galite pasinaudoti SIM kortelės mobiliojo ryšio duomenimis atlikdami ir gaudami skambučius iš kitos SIM kortelės."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Skambučiai"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d210701..ce210d1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automātiski ranžēt paziņojumus pēc atbilstības"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsauksmes par adaptīvajiem paziņojumiem"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Norādīt korekcijas, kas veiktas paziņojumiem, un rādīt opciju iesniegt sistēmā atsauksmes"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Svarīguma paziņojumu atiestatīšana"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Atiestatiet svarīguma iestatījumus, ko mainīja lietotājs, un atļaujiet paziņojumu asistentam piešķirt prioritāti."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Darbību un atbilžu ieteikumi"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automātiski rādīt ieteicamās darbības un atbildes"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Rādīt jaunākos un atliktos paziņojumus"</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nav pieejams, ja izveidots savienojums ar operatoru <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Skatīt vairāk"</string>
<string name="see_less" msgid="2642392725363552793">"Skatīt mazāk"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vai ieslēgt operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vai ieslēgt SIM karti?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vai pārslēgt uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vai pārslēgties uz SIM kartes izmantošanu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vienlaikus aktīva var būt tikai viena SIM karte.\n\nPārslēdzoties uz operatoru <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, netiks atcelti <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> pakalpojumi."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vienlaikus aktīva var būt tikai viena lejupielādēta SIM karte.\n\nPārslēdzoties uz operatoru <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, netiks atcelti <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> pakalpojumi."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vienlaikus var būt aktīva tikai viena SIM karte.\n\nPārslēdzoties netiks atcelti <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> pakalpojumi."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Pārslēgties uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Notiek savienojuma izveide ar tīklu…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Notiek pārslēgšanās uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nevar pārslēgties uz cita mobilo sakaru operatora tīklu"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nevar pārslēgties uz cita mobilo sakaru operatora tīklu, jo radās kļūda."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vai izslēgt pakalpojumu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vai izslēgt SIM karti?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Notiek SIM kartes izslēgšana<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilo sakaru operatoru nevar atspējot"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nevar atspējot mobilo sakaru operatoru"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Radās kļūda, un mobilo sakaru operatoru nevarēja atspējot."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vai izmantot divas SIM kartes?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Šajā ierīcē vienlaikus var būt aktīvas divas SIM kartes. Lai turpinātu vienlaikus lietot vienu SIM karti, pieskarieties vienumam “Nē, paldies”."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vai restartēt ierīci?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Lai sāktu darbu, restartējiet savu ierīci. Pēc tam varēsiet pievienot citu SIM karti."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Turpināt"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Restartēt"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nē, paldies"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Pārslēgt"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nevar aktivizēt SIM karti"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izņemiet un atkal ievietojiet SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Mēģiniet atkal ieslēgt SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vai dzēst šo lejupielādēto SIM karti?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Izdzēšot šo SIM karti, operatora “<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>” pakalpojumi tiek noņemti no šīs ierīces.\n\nOperatora “<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>” pakalpojumi netiks atcelti."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Dzēst"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Tiks ieslēgts Bluetooth savienojums."</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Ieslēgta"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Izslēgta"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internets"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartes"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Tīkli, ko var izmantot lidojuma režīmā"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Atrodiet tīklus, ko var izmantot lidojuma režīmā, un izveidojiet savienojumu ar tiem."</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lidojuma režīms, var izmantot lidojuma režīmu"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Zvani un īsziņas"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi zvani"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Veikt un saņemt zvanus, izmantojot tīklus, ko nenodrošina mobilo sakaru operatori, piemēram, Wi-Fi tīklus"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Izmantojot Wi-Fi zvanus, varat veikt un saņemt zvanus tīklos, ko nenodrošina mobilo sakaru operatori, piemēram, dažos Wi-Fi tīklos.\n\nZvanīšana ar citu SIM karti ir iespēja izmantot vienas SIM kartes mobilos datus, lai veiktu un saņemtu zvanus ar citu SIM karti."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Zvani"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Īsziņas"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6e392db..f680ab2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1935,7 +1935,7 @@
<string name="default_emergency_app" msgid="1929974800666613803">"Апликација за итност"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Ресетирај ги поставките за апликациите"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Да се ресетираат поставките за апликациите?"</string>
- <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Со ова ќе се ресетираат сите поставки за:\n\n"<li>"оневозможените апликации;"</li>\n<li>"оневозможените известувања за апликации;"</li>\n<li>"стандардните апликации за дејства;"</li>\n<li>"ограничувањата за податоци од заднина за апликациите;"</li>\n<li>"сите ограничувања за дозволите."</li>\n\n"Нема да изгубите никакви податоци на апликациите."</string>
+ <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Со ова ќе се ресетираат сите поставки за:\n\n"<li>"оневозможените апликации;"</li>\n<li>"оневозможените известувања за апликации;"</li>\n<li>"стандардните апликации за дејства;"</li>\n<li>"ограничувањата за интернет во заднина за апликациите;"</li>\n<li>"сите ограничувања за дозволите."</li>\n\n"Нема да изгубите никакви податоци во апликациите."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Ресетирај апликации"</string>
<string name="manage_space_text" msgid="9013414693633572277">"Управувај со простор"</string>
<string name="filter" msgid="9039576690686251462">"Филтер"</string>
@@ -1978,7 +1978,7 @@
<string name="force_stop_dlg_text" msgid="1527286468544457368">"Ако присилно запрете апликација, таа може да не се однесува правилно."</string>
<string name="app_install_location_title" msgid="8932938164156303191">"Претпочиана локација на инсталирање"</string>
<string name="app_install_location_summary" msgid="4948270795544357021">"Променете ја претпочитаната локација на инсталирање за нови апликации."</string>
- <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Оневозможете ја апликацијата"</string>
+ <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Оневозможи ја апликацијата"</string>
<string name="app_disable_dlg_text" msgid="2449382902751908916">"Ако ја оневозможите оваа апликација, Android и другите апликации можеби веќе нема да функционираат како што треба. Имајте предвид, не може да ја избришете апликацијава бидејќи е однапред инсталирана на уредот. Ако ја оневозможите, ќе ја исклучите и ќе ја сокриете на уредот."</string>
<string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Исклучи известувања?"</string>
<string name="app_install_details_group_title" msgid="1172114479073704677">"Продавница"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматски рангирај ги известувањата според важност"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратни информации за приспособливи известувања"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означувај ги приспособувањата извршени на известувањата и прикажувај ја опцијата за обезбедување повратни информации на системот"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ресетирајте ја важноста на известувањата"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетирајте ги поставките за важност променети од корисникот и дозволете помошникот за известувања да одредува приоритети"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени дејства и одговори"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматски прикажувај предложени дејства и одговори"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Прикажувај неодамнешни и одложени известувања"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недостапно кога сте поврзани на <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Видете повеќе"</string>
<string name="see_less" msgid="2642392725363552793">"Види помалку"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Да се вклучи <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Да се вклучи SIM-картичката?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Дали сакате да се префрлите на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Дали сакате да се префрлите на SIM-картичката?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Само една SIM-картичка може да биде активна.\n\nАко се префрлите на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, нема да се откаже услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Само една од преземените SIM-картички може да биде активна.\n\nАко се префрлите на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, нема да се откаже услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Само една SIM-картичка може да биде активна.\n\nАко се префрлите, нема да се откаже услугата на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Префрли на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Се поврзува со мрежа…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Се префрла на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не може да се промени операторот"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Операторот не може да се промени поради грешка."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се исклучи <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се исклучи SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Се исклучува SIM-картичката<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не може да се оневозможи операторот"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не може да се оневозможи операторот"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешто тргна наопаку и не можеше да се оневозможи операторот."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Да се користат 2 SIM-картички?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Уредов може да има 2 активни SIM-картички истовремено. За да продолжите да користите само 1 SIM-картичка, допрете „Не, фала“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Да се рестартира уредот?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"За да започнете, рестартирајте го уредот. Потоа може да додадете друга SIM-картичка."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Продолжи"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартирај"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, фала"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Префрли"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не може да се активира SIM-картичката"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извадете и повторно вметнете ја SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Обидете се повторно да ја вклучите SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Да се избрише преземената SIM-картичка?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ако ја избришете SIM-картичкава, услугата на <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ќе се отстрани од уредов.\n\nУслугата за <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> нема да се откаже."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Избриши"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ќе се вклучи"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Вклучен"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Исклучен"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-картички"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Мрежи безбедни за во авион"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Најдете и поврзете се на мрежи безбедни за во авион"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно за во авион"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Повици & SMS-пораки"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Повици преку Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Упатувајте и примајте повици преку мрежи што не се на операторот, на пр., Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Повиците преку Wi-Fi ви овозможуваат да упатувате и примате повици преку мрежи што не се на операторот, на пр., некои Wi‑Fi мрежи.\n\nПовиците преку вкрстени SIM-картички ви овозможуваат да го користите мобилниот интернет од една SIM-картичка за упатување и примање повици од друга SIM-картичка."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Повици"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 2f34635..64ee1dc 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"അറിയിപ്പുകൾ പ്രസക്തി അനുസരിച്ച് സ്വയമേവ റാങ്ക് ചെയ്യൂ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"അനുയോജ്യമായ അറിയിപ്പുകൾക്കുള്ള ഫീഡ്ബാക്ക്"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"അറിയിപ്പുകളിൽ വരുത്തിയ അഡ്ജസ്റ്റുമെന്റുകൾ സൂചിപ്പിക്കുകയും സിസ്റ്റത്തിലേക്ക് ഫീഡ്ബാക്ക് നൽകാനുള്ള ഓപ്ഷൻ കാണിക്കുകയും ചെയ്യുക"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"അറിയിപ്പിന്റെ പ്രാധാന്യം റീസെറ്റ് ചെയ്യുക"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ഉപയോക്താവ് മാറ്റിയ പ്രാധാന്യ ക്രമീകരണം റീസെറ്റ് ചെയ്യുക, മുൻഗണന നൽകാൻ അറിയിപ്പ് സഹായിയെ അനുവദിക്കുക"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും സ്വയമേവ കാണിക്കൂ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"സമീപകാലത്തുള്ളതും സ്നൂസ് ചെയ്തതുമായ അറിയിപ്പുകൾ കാണിക്കുക"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
<string name="see_more" msgid="7499355691042812723">"കൂടുതൽ കാണുക"</string>
<string name="see_less" msgid="2642392725363552793">"കുറച്ച് കാണുക"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ഓണാക്കണോ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ഓണാക്കണോ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറണോ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM കാർഡ് ഉപയോഗിച്ച് മാറണോ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ഒരു സമയത്ത് ഒരു SIM മാത്രമേ സജീവമായിരിക്കൂ.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നത് നിങ്ങളുടെ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ഡൗൺലോഡ് ചെയ്ത ഒരു SIM മാത്രമേ ഒരു സമയത്ത് സജീവമായിരിക്കൂ.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നത് നിങ്ങളുടെ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ഒരു സമയത്ത് ഒരു SIM മാത്രമേ സജീവമായിരിക്കൂ.\n\nമാറുന്നത് നിങ്ങളുടെ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുക"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"നെറ്റ്വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുന്നു…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നു"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"കാരിയറെ മാറ്റാനാകുന്നില്ല"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ഒരു പിശക് കാരണം കാരിയറെ മാറ്റാനാകുന്നില്ല."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ഓഫാക്കണോ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ഓഫാക്കണോ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"സിം ഓഫാക്കുന്നു<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനാകുന്നില്ല"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനാകില്ല"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"എന്തോ കുഴപ്പം സംഭവിച്ചതിനാൽ നിങ്ങളുടെ സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനായില്ല."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"രണ്ട് SIM-കളും ഉപയോഗിക്കണോ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ഈ ഉപകരണത്തിൽ ഒരേസമയം സജീവമായ രണ്ട് SIM-കൾ ആകാം. ഒരു സമയത്ത് ഒരു SIM മാത്രം ഉപയോഗിക്കുന്നത് തുടരാൻ, \"വേണ്ട\" ടാപ്പ് ചെയ്യുക."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യണോ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ആരംഭിക്കാൻ, നിങ്ങളുടെ ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുക. തുടർന്ന് നിങ്ങൾക്ക് മറ്റൊരു SIM ചേർക്കാം."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"തുടരുക"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"റീസ്റ്റാർട്ട് ചെയ്യുക"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"വേണ്ട"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"മാറുക"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM സജീവമാക്കാനാകില്ല"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM നീക്കം ചെയ്ത് വീണ്ടും ഇടുക. പ്രശ്നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുക."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM വീണ്ടും ഓണാക്കാൻ ശ്രമിക്കുക. പ്രശ്നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുക."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ഡൗൺലോഡ് ചെയ്ത ഈ സിം മായ്ക്കണോ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ഈ സിം മായ്ക്കുന്നതിലൂടെ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> സേവനം ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കം ചെയ്യപ്പെടും.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"മായ്ക്കുക"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ഓണാകും"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ഓണാണ്"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ഓഫാണ്"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ഇന്റർനെറ്റ്"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"സിമ്മുകൾ"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"വിമാന-സുരക്ഷിത നെറ്റ്വർക്കുകൾ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"വിമാന-സുരക്ഷിത നെറ്റ്വർക്കുകൾ കണ്ടെത്തി കണക്റ്റ് ചെയ്യുക"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"വിമാനം, വിമാന-സുരക്ഷിതം"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"കോളുകളും & SMS-കളും"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"വൈഫൈ കോളിംഗ്"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"വൈഫൈ പോലുള്ള സേവനദാതാക്കൾ നൽകാത്ത നെറ്റ്വർക്കുകളിലൂടെ കോളുകൾ ചെയ്യുക, സ്വീകരിക്കുക"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ചില വൈ-ഫൈ നെറ്റ്വർക്കുകൾ പോലുള്ള സേവനദാതാക്കൾ നൽകാത്ത നെറ്റ്വർക്കുകളിലൂടെ കോളുകൾ വിളിക്കാനും സ്വീകരിക്കാനും വൈഫൈ കോളിംഗ് നിങ്ങളെ അനുവദിക്കുന്നു.\n\nമറ്റൊരു സിമ്മിൽ നിന്ന് കോളുകൾ വിളിക്കുന്നതിനും സ്വീകരിക്കുന്നതിനും ഒരു സിമ്മിന്റെ മൊബൈൽ ഡാറ്റ പ്രയോജനപ്പെടുത്താൻ ക്രോസ്-സിം കോളിംഗ് നിങ്ങളെ അനുവദിക്കുന്നു."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"കോളുകൾ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 78c23fe..55c14b3 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2813,7 +2813,7 @@
<string name="really_remove_account_title" msgid="253097435885652310">"Бүртгэлийг арилгах уу?"</string>
<string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Энэ акаунтыг арилгаснаас үүний бүх мессеж, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
<string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
- <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг устгаснаар үүний бүх мессеж, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
+ <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
<string name="remove_account_failed" msgid="3709502163548900644">"Энэ өөрчлөлтийг таны админ зөвшөөрөөгүй байна"</string>
<string name="cant_sync_dialog_title" msgid="2613000568881139517">"Гараар синк хийх боломжгүй"</string>
<string name="cant_sync_dialog_message" msgid="7612557105054568581">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
@@ -3287,7 +3287,7 @@
<string name="keywords_imei_info" msgid="8848791606402333514">"imei, meid, min, prl хувилбар, imei sv"</string>
<string name="keywords_sim_status" msgid="8784456547742075508">"сүлжээ, мобайл сүлжээний төлөв, үйлчилгээний төлөв, дохионы хүч, мобайл сүлжээний төрөл, роуминг, iccid, eid"</string>
<string name="keywords_model_and_hardware" msgid="4723665865709965044">"серийн дугаар, техник хангамжийн хувилбар"</string>
- <string name="keywords_android_version" msgid="1629882125290323070">"андройдын аюулгүй байдлын patch-н түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
+ <string name="keywords_android_version" msgid="1629882125290323070">"андройдын аюулгүй байдлын засварын түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
<string name="keywords_dark_ui_mode" msgid="6465231409128452489">"загвар, цайвар, бараан, горим"</string>
<string name="keywords_systemui_theme" msgid="6341194275296707801">"бараан загвар"</string>
<string name="keywords_device_feedback" msgid="5489930491636300027">"алдаа"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хамаарлын дагуу мэдэгдлийн зэрэглэлийг автоматаар хийх"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Орчинтой тохирсон мэдэгдлийн санал хүсэлт"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Мэдэгдэлд хийсэн тохируулгыг зааж, системд санал хүсэлт өгөх сонголтыг харуулах"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Мэдэгдлийн чухал байдлыг шинэчлэх"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Хэрэглэгчийн өөрчилсөн чухал байдлын тохиргоог шинэчилж, мэдэгдлийн туслахад хэр чухлаар нь дараалуулахыг зөвшөөрөх"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Санал болгосон үйлдлүүд болон хариу"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Санал болгосон үйлдлүүд болон хариуг автоматаар харуулах"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Саяхны болон түр хойшлуулсан мэдэгдлүүдийг харуулах"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-д холбогдсон үед боломжгүй"</string>
<string name="see_more" msgid="7499355691042812723">"Дэлгэрэнгүй үзэх"</string>
<string name="see_less" msgid="2642392725363552793">"Цөөнийг харах"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-г асаах уу?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"СИМ-г асаах уу?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэх үү?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"СИМ картыг ашиглахад сэлгэх үү?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нэг удаад зөвхөн нэг СИМ-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нэг удаад зөвхөн нэг татаж авсан СИМ-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нэг удаад зөвхөн нэг СИМ идэвхжүүлэх боломжтой.\n\nСэлгэснээр таны <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэх"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Сүлжээнд холбогдож байна…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэж байна"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Оператор компанийг сэлгэх боломжгүй"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Алдааны улмаас оператор компанийг сэлгэх боломжгүй байна."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-г унтраах уу?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-г унтраах уу?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-г унтрааж байна<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Оператор компанийг идэвхгүй болгох боломжгүй"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Оператор компанийг идэвхгүй болгох боломжгүй"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Алдаа гарсан тул таны оператор компанийг идэвхгүй болгож чадсангүй."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 СИМ ашиглах уу?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Энэ төхөөрөмжид 2 СИМ-г зэрэг идэвхжүүлэх боломжтой. Одоогоор 1 СИМ-г үргэлжлүүлэн ашиглах бол \"Үгүй, баярлалаа\"-г товшино уу."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Эхлүүлэхийн тулд төхөөрөмжөө дахин эхлүүлнэ үү. Дараа нь та өөр СИМ нэмэх боломжтой."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Үргэлжлүүлэх"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Дахин эхлүүлэх"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Үгүй, баярлалаа"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Сэлгэх"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"СИМ-г идэвхжүүлэх боломжгүй"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"СИМ-г салгаад, дахин хийнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"СИМ-г дахин асааж үзнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Энэ татаж авсан СИМ-г устгах уу?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Энэ СИМ-г устгаснаар <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-н үйлчилгээг энэ төхөөрөмжөөс хасна.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Устгах"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-г асаана"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Асаалттай"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Унтраалттай"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернэт"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Нислэгийн аюулгүй сүлжээ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Нислэгийн аюулгүй сүлжээг хайж олж, холбогдох"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"нислэг, нислэг аюулгүй"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Дуудлага, SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi дуудлага"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi зэрэг оператор компанийн бус сүлжээгээр дуудлага хийх, хүлээн авах"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi дуудлага нь танд зарим Wi-Fi сүлжээ зэрэг оператор компанийн бус сүлжээгээр дуудлага хийх, хүлээн авах боломжийг олгодог.\n\nSIM хоорондын дуудлага нь танд өөр SIM-с дуудлага хийх, хүлээн авахын тулд SIM-н мобайл датаг ашиглах боломж олгодог."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Дуудлага"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0f5db3c..74941c0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -3089,15 +3089,15 @@
<string name="nfc_payment_use_default" msgid="788899906312142803">"डीफॉल्ट वापरा"</string>
<string name="nfc_payment_favor_default" msgid="4508491832174644772">"नेहमी"</string>
<string name="nfc_payment_favor_open" msgid="8554643344050373346">"दुसरा पेमेंट अॅप खुला असतो तेव्हा त्यास वगळून"</string>
- <string name="nfc_payment_pay_with" msgid="3001320460566523453">"संपर्करहीत टर्मिनलवर यावरून पैसे द्या:"</string>
+ <string name="nfc_payment_pay_with" msgid="3001320460566523453">"संपर्करहित टर्मिनलवर यावरून पैसे द्या:"</string>
<string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलवर पेमेंट करा"</string>
<string name="nfc_how_it_works_content" msgid="1141382684788210772">"पेमेंट अॅप सेट करा. त्यानंतर संपर्करहित पेमेंटचा आयकन असलेल्या कोणत्याही टर्मिनलवर तुमच्या फोनची मागील बाजू धरा."</string>
<string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"समजले"</string>
<string name="nfc_more_title" msgid="1041094244767216498">"आणखी…"</string>
<string name="nfc_payment_set_default_label" msgid="7395939287766230293">"डीफॉल्ट पेमेंट अॅप सेट करा"</string>
<string name="nfc_payment_update_default_label" msgid="8201975914337221246">"डीफॉल्ट पेमेंट अॅप अपडेट करा"</string>
- <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहीत टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
- <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"संपर्करहीत टर्मिनलवर <xliff:g id="APP_0">%1$s</xliff:g> वापरून पैसे द्या.\n\nहे <xliff:g id="APP_1">%2$s</xliff:g> ला तुमचे डीफॉल्ट पेमेंट अॅप म्हणून बदलते."</string>
+ <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहित टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
+ <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"संपर्करहित टर्मिनलवर <xliff:g id="APP_0">%1$s</xliff:g> वापरून पैसे द्या.\n\nहे <xliff:g id="APP_1">%2$s</xliff:g> ला तुमचे डीफॉल्ट पेमेंट अॅप म्हणून बदलते."</string>
<string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"डीफॉल्ट म्हणून सेट करा"</string>
<string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"अपडेट करा"</string>
<string name="restriction_settings_title" msgid="4293731103465972557">"निर्बंध"</string>
@@ -3478,6 +3478,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"उपयुक्ततेनुसार सूचनांना आपोआप रँक करा"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"अडॅप्टिव्ह सूचना फीडबॅक"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनांमध्ये केलेल्या अॅडजस्टमेंट दाखवा आणि सिस्टममध्ये फीडबॅक देण्याचा पर्याय नमूद करा"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनेचे महत्त्व रीसेट करा"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"वापरकर्त्याने बदललेली महत्त्वपूर्ण सेटिंग्ज रीसेट करा आणि सूचना असिस्टंटला प्राधान्य देण्याची परवानगी द्या"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुचवलेली कृती आणि उत्तरे"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुचवलेली कृती आणि उत्तरे आपोआप दाखवा"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"अलीकडील आणि स्नूझ केलेल्या सूचना दाखवा"</string>
@@ -4846,11 +4848,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
<string name="see_more" msgid="7499355691042812723">"आणखी पाहा"</string>
<string name="see_less" msgid="2642392725363552793">"कमी पहा"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सुरू करायचे आहे का?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"सिम सुरू करायचे आहे का?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करायचे आहे का?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"सिम कार्ड वापरण्यावर स्विच करायचे आहे का?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एका वेळी एक सिम अॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमची <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाही."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एका वेळी डाउनलोड केलेले फक्त एकच सिम अॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमच्या <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाहीत."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एकावेळी एकच सिम अॅक्टिव्ह असू शकते.\n\nस्विच केल्याने तुमची <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> सेवा रद्द होणार नाही."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करा"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कशी कनेक्ट करत आहे…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करत आहे"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"वाहक स्विच करू शकत नाही"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"एररमुळे वाहक स्विच करू शकत नाही."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> बंद करायचे आहे का?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"सिम बंद करायचे आहे का?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद करत आहे<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"वाहक बंद करू शकत नाही"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"वाहक बंद करू शकत नाही"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"काहीतरी गडबड झाली आणि तुमचा वाहक बंद करता आला नाही."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दोन सिम वापरायची आहेत का?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"या डिव्हाइसमध्ये एकाच वेळी दोन सिम अॅक्टिव्ह असू शकतात. एकावेळी एक सिम वापरणे सुरू ठेवण्यासाठी, \"नाही, नको\" वर टॅप करा."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"डिव्हाइस रीस्टार्ट करायचे आहे का?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरुवात करण्यासाठी, तुमचे डिव्हाइस रीस्टार्ट करा. नंतर तुम्ही दुसरे सिम जोडू शकता."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"पुढे सुरू ठेवा"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करा"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"नाही, नको"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"स्विच करा"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम ॲक्टिव्हेट करू शकत नाही"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम पुन्हा सुरू करून पाहा. समस्या सुरू राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"हे डाउनलोड केलेले सिम मिटवायचे?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"हे सिम मिटवल्याने या डिव्हाइसवरून <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा काढली जाते.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ची सेवा रद्द केली जाणार नाही."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"मिटवा"</string>
@@ -4989,4 +5014,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ सुरू होईल"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"सुरू करा"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद करा"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क शोधा आणि कनेक्ट करा"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"विमान, विमान सुरक्षित"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"कॉल आणि एसएमएस"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"वाय-फाय कॉलिंग"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करा आणि घ्या"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"वाय-फाय कॉलिंग हे तुम्हाला वाय-फाय नेटवर्कसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करण्याची आणि घेण्याची अनुमती देते.\n\nक्रॉस-सिम कॉलिंग हे तुम्हाला दुसऱ्या सिमवरून कॉल करण्यासाठी आणि घेण्यासाठी सिमच्या मोबाइल डेटाचा लाभ घेण्याची अनुमती देते."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"एसएमएस"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7a17f687..2bc3f92 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1979,7 +1979,7 @@
<string name="app_install_location_title" msgid="8932938164156303191">"Lokasi pemasangan pilihan"</string>
<string name="app_install_location_summary" msgid="4948270795544357021">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
<string name="app_disable_dlg_positive" msgid="1414218905322009505">"Lumpuhkan apl"</string>
- <string name="app_disable_dlg_text" msgid="2449382902751908916">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang dimaksudkan lagi. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
+ <string name="app_disable_dlg_text" msgid="2449382902751908916">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang sepatutnya. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
<string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Matikan pemberitahuan"</string>
<string name="app_install_details_group_title" msgid="1172114479073704677">"Gedung"</string>
<string name="app_install_details_title" msgid="7783556181897142187">"Butiran apl"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Atur kedudukan pemberitahuan secara automatik mengikut kaitan"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maklum balas pemberitahuan mudah suai"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Tunjukkan pelarasan yang dibuat pada pemberitahuan dan tunjukkan pilihan untuk memberikan maklum balas kepada sistem"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Tetapkan semula kepentingan pemberitahuan"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Pengguna yang ditetapkan semula telah mengubah tetapan kepentingan dan membenarkan pembantu pemberitahuan untuk melakukan keutamaan."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tindakan dan balasan yang dicadangkan"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tunjukkan tindakan & balasan yang dicadangkan secara automatik"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Tunjukkan pemberitahuan baru-baru ini dan pemberitahuan yang ditunda"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia apabila disambungkan ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Lihat lagi"</string>
<string name="see_less" msgid="2642392725363552793">"Lihat kurang"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Hidupkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Hidupkan SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Tukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Tukar kepada penggunaan kad SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang boleh aktif pada satu-satu masa.\n\nBertukar kepada <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan perkhidmatan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> anda."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM yang dimuat turun boleh aktif pada satu-satu masa.\n\nBertukar kepada <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan perkhidmatan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> anda."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hanya satu SIM yang boleh aktif pada satu-satu masa.\n\nPenukaran tidak akan membatalkan perkhidmatan <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> anda."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Tukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Menyambung kepada rangkaian…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Bertukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Tidak dapat menukar pembawa"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Pembawa tidak dapat ditukar disebabkan ralat."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Matikan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Matikan SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Mematikan SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Tidak dapat melumpuhkan pembawa"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Tidak dapat melumpuhkan pembawa"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kesilapan telah berlaku dan pembawa anda tidak dapat dilumpuhkan."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gunakan 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Peranti ini boleh mempunyai 2 SIM aktif serentak. Untuk terus menggunakan 1 SIM pada satu-satu masa, ketik \"Tidak perlu\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Mulakan semula peranti?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Untuk bermula, mulakan semula peranti anda. Kemudian, anda boleh menambahkan SIM lain."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Teruskan"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Mulakan semula"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Tidak perlu"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Tukar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM dan masukkan kad itu kembali. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Cuba hidupkan SIM sekali lagi. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Padamkan SIM yang dimuat turun ini?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Pemadaman SIM ini akan mengalih keluar perkhidmatan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> daripada peranti ini.\n\nPerkhidmatan <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> tidak akan dibatalkan."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Padam"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan dihidupkan"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Hidup"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Mati"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Rangkaian selamat pesawat"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cari dan sambung ke rangkaian selamat pesawat"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, selamat pesawat"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Buat dan terima panggilan melalui rangkaian bukan pembawa seperti Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Panggilan Wi-Fi membolehkan anda membuat dan menerima panggilan melalui rangkaian bukan pembawa seperti sesetengah rangkaian Wi-Fi.\n\nPanggilan silang SIM membolehkan anda memanfaatkan data mudah alih SIM untuk membuat dan menerima panggilan daripada SIM lain."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Panggilan"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index e0bf959..38e5131 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"သက်ဆိုင်ရာအလိုက် အလိုလို သတ်မှတ်ထားသော အဆင့်သတ်မှတ်မှု အကြောင်းကြားချက်"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"အလိုက်သင့် အကြောင်းကြားချက်ဆိုင်ရာ အကြံပြုချက်"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"အကြောင်းကြားချက်များအပေါ်တွင် ပြုလုပ်ထားသော ပြင်ဆင်ချက်များကို ညွှန်ပြပြီး စနစ်သို့ အကြံပြုချက်ပေးသည့် ရွေးစရာကို ပြသသည်"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"အကြောင်းကြားချက် အရေးပါမှုကို ပြင်ဆင်သတ်မှတ်ခြင်း"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"အသုံးပြုသူက ပြောင်းလဲလိုက်သည့် အရေးကြီးသော ဆက်တင်များကို ပြင်ဆင်သတ်မှတ်ပြီး အကြောင်းကြားချက် အထောက်အကူကို ဦးစားပေးရန် ခွင့်ပြုသည်"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"အကြံပြုထားသော လုပ်ဆောင်ချက်နှင့် ပြန်ကြားချက်များ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"အကြံပြုထားသော လုပ်ဆောင်ချက်များနှင့် ပြန်ကြားချက်များကို အလိုအလျောက်ပြသပါ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"လတ်တလောနှင့် မှေးထားသည့် အကြောင်းကြားချက်များကို ပြရန်"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> တွင် ချိတ်ဆက်ထားသည့်အခါ မရနိုင်ပါ"</string>
<string name="see_more" msgid="7499355691042812723">"ပိုပြရန်"</string>
<string name="see_less" msgid="2642392725363552793">"လျှော့ ကြည့်ရန်"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ကို ဖွင့်မလား။"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ဆင်းမ်ကို ဖွင့်မလား။"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းမလား။"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ဆင်းမ်ကတ်အသုံးပြုခြင်းသို့ ပြောင်းမလား။"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"တစ်ကြိမ်တွင် ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> သို့ပြောင်းခြင်းက သင့် <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"တစ်ကြိမ်တွင် ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> သို့ပြောင်းခြင်းက သင့် <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"တစ်ကြိမ်တွင် ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\nပြောင်းခြင်းက သင့် <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းရန်"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ကွန်ရက်သို့ ချိတ်ဆက်နေသည်…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းနေသည်"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ဝန်ဆောင်မှုပေးသူကို ပြောင်း၍မရပါ"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"အမှားအယွင်းတစ်ခုကြောင့် ဝန်ဆောင်မှုပေးသူကို ပြောင်း၍မရပါ။"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ပိတ်မလား။"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"\'ဆင်းမ်ကဒ်\' ပိတ်မလား။"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"\'ဆင်းမ်ကဒ်\' ပိတ်နေသည်<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ဝန်ဆောင်မှုပေးသူကို ပိတ်မရပါ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ဝန်ဆောင်မှုပေးသူကို ပိတ်၍မရပါ"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"တစ်ခုခုမှားယွင်းသွားပါ၍ သင့်ဝန်ဆောင်မှုပေးသူကို ပိတ်မရခဲ့ပါ။"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ဆင်းမ် ၂ ကတ် သုံးမလား။"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ဤစက်တွင် ဆင်းမ် ၂ ကတ် တစ်ပြိုင်နက် စတင်နိုင်သည်။ တစ်ကြိမ်တွင် ဆင်းမ် ၁ ကတ်ဖြင့် ဆက်သုံးရန် \"မလိုတော့ပါ\" ကိုတို့ပါ။"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"စက်ကို ပြန်စမလား။"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"စတင်ရန်အတွက် သင့်စက်ကို ပြန်စပါ။ ထို့နောက် နောက်ဆင်းမ်ကို ထည့်နိုင်ပါသည်။"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ရှေ့ဆက်ရန်"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ပြန်စရန်"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"မလိုပါ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ပြောင်းရန်"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ဆင်းမ်ကို ဖွင့်၍မရပါ"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ဆင်းမ်ကို ဖယ်ရှားပြီး ပြန်ထည့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ဆင်းမ်ကို ပြန်ဖွင့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ဒေါင်းလုဒ်လုပ်ထားသော ဤဆင်းမ်ကို ဖျက်လိုသလား။"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ဤဆင်းမ်ကို ဖျက်ခြင်းဖြင့် ဤစက်ပစ္စည်းမှ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ဝန်ဆောင်မှုကို ဖယ်ရှားပါမည်။\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> အတွက် ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ဖျက်ရန်"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ဘလူးတုသ် ပွင့်ပါမည်"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ဖွင့်ထားသည်"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ပိတ်ထားသည်"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"အင်တာနက်"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ဆင်းမ်များ"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"လေယာဉ်ပျံမုဒ်တွင် လုံခြုံသော ကွန်ရက်များ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"လေယာဉ်ပျံမုဒ်တွင် လုံခြုံသောကွန်ရက်များကို ရှာဖွေပြီး ချိတ်ဆက်သည်"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"လေယာဉ်ပျံ၊ လေယာဉ်ပျံမုဒ်တွင် လုံခြုံခြင်း"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ခေါ်ဆိုမှုများနှင့် SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ခေါ်ဆိုမှု"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမှမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းများကို ပြုလုပ်ပါ"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi ခေါ်ဆိုမှုက Wi-Fi ကွန်ရက်အချို့ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမှမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းများကို ပြုလုပ်ရန်ခွင့်ပြုသည်။\n\nCross-SIM ခေါ်ဆိုမှုက နောက်ဆင်းမ်တစ်ခုမှ ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းများကို ပြုလုပ်ရန်အတွက် ဆင်းမ်တစ်ခု၏ မိုဘိုင်းဒေတာကို တွန်းအားပေးရန် ခွင့်ပြုသည်။"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ခေါ်ဆိုမှုများ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 790f7ff..e4584bc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3329,7 +3329,7 @@
<string name="alarm_volume_option_title" msgid="6398641749273697140">"Alarmvolum"</string>
<string name="ring_volume_option_title" msgid="1520802026403038560">"Ringe- og varselvolum"</string>
<string name="notification_volume_option_title" msgid="4838818791683615978">"Varselvolum"</string>
- <string name="ringtone_title" msgid="3271453110387368088">"Telefonringelyd"</string>
+ <string name="ringtone_title" msgid="3271453110387368088">"Ringetone"</string>
<string name="notification_ringtone_title" msgid="6924501621312095512">"Standard varsellyd"</string>
<string name="notification_unknown_sound_title" msgid="1319708450698738980">"Lyd fra app"</string>
<string name="notification_sound_default" msgid="8630353701915294299">"Standard varsellyd"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger varsler automatisk etter relevans"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Tilbakemelding om tilpasset varsel"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer av varsler og alternativet for å gi tilbakemelding til systemet"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Tilbakestill viktighet for varsler"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Tilbakestill viktighetsinnstillinger som er endret av brukeren, og tillat at varselassistenten angir prioritet"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåtte handlinger og svar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis foreslåtte handlinger og svar automatisk"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Vis nylige og slumrede varsler"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgjengelig når du er koblet til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Se flere"</string>
<string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vil du slå på <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vil du slå på SIM-kortet?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vil du bytte til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vil du bytte til å bruke SIM-kort?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Bare ett SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, blir ikke <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-abonnementet ditt sagt opp."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Bare ett nedlastet SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, blir ikke <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-abonnementet ditt sagt opp."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Bare ett SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter, blir ikke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-abonnementet ditt sagt opp."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Bytt til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Kobler til nettverket …"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Bytter til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan ikke bytte operatør"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operatøren kan ikke byttes, på grunn av en feil."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du slå av <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du slå av SIM-kortet?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slår av SIM-kort <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan ikke slå av operatøren"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan ikke slå av operatøren"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noe gikk galt, og enheten kunne ikke slå av operatøren."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vil du bruke to SIM-kort?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Denne enheten kan ha to SIM-kort aktive samtidig. For å fortsette å bruke ett SIM-kort om gangen, trykk på «Nei takk»"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vil du starte enheten på nytt?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Start enheten på nytt for å komme i gang. Deretter kan du legge til et annet SIM-kort."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Fortsett"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Start på nytt"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei takk"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Bytt"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan ikke aktivere SIM-kortet"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjern SIM-kortet og sett det inn igjen. Start enheten på nytt hvis problemet vedvarer."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv å slå på SIM-kortet igjen. Start enheten på nytt hvis problemet vedvarer."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vil du slette dette nedlastede SIM-kortet?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Hvis du tømmer dette SIM-kortet, fjernes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-tjenesten fra denne enheten.\n\nTjenesten for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> blir ikke kansellert."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Slett"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth slås på"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"På"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internett"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Nettverk som er trygge på fly"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Finn og koble til nettverk som er trygge på fly"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, trygg på fly"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Anrop og SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-anrop"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Ring og motta anrop via nettverk utenfor operatøren, for eksempel Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Med Wi-Fi-anrop kan du ringe og motta anrop via nettverk utenfor operatøren, for eksempel noen Wi-Fi-nettverk.\n\nMed ringing mellom SIM-kort kan du bruke mobildata på ett SIM-kort til å ringe og motta anrop fra et annet SIM-kort."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Anrop"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 1d6d9a9..9e016fc 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"सन्दर्भअनुसार सूचनाहरू स्वतः श्रेणीबद्ध गर्नुहोस्"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"परिस्थितिअनुसार प्राप्त हुने सूचनाबारे प्रतिक्रिया"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनाहरूमा गरिएको समायोजनबारे सूचित गर्छ र सिस्टमका बारेमा प्रतिक्रिया दिने विकल्प देखाउँछ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनाको प्राथमिकता रिसेट गर्नुहोस्"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"प्रयोगकर्ताले परिवर्तन गरेका प्राथमिकतासम्बन्धी सेटिङ रिसेट गर्नुहोस् र सूचना सहायकलाई प्राथमिकता तय गर्ने अनुमति दिनुहोस्"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सिफारिस गरिएका कारबाही तथा जवाफहरू"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सिफारिस गरिएका कारबाही तथा जवाफहरू स्वतः देखाउनुहोस्"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"हालका र स्नुज गरिएका सूचनाहरू देखाउनुहोस्"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ट्याब्लेटको जाँच गर्न ट्याप गर्नुहोस्"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"यन्त्रको जाँच गर्न ट्याप गर्नुहोस्"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा ट्याप गर्नुहोस्।"</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आपत्कालीन सेवा"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले व्यवस्थापन गरेको"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"फटाफट ५ पटक पावर बटन थिचेर आपत्कालीन उद्धार सेवामा सम्पर्क गर्नुहोस्।"</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"चेतावनी दिने आवाज"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"आपत्कालीन उद्धार सेवाहरूमा सम्पर्क गर्नुअघि अलर्ट जारी गर्नुहोस्"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिन्ट स्वाइप गर्नु"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
<string name="see_more" msgid="7499355691042812723">"थप हेर्नुहोस्"</string>
<string name="see_less" msgid="2642392725363552793">"कम हेर्नुहोस्"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय गर्ने हो?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM सक्रिय गर्ने हो?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्ने हो?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"यो SIM बदलेर प्रयोग भइरहेको SIM प्रयोग गर्ने हो?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक पटकमा, डाउनलोड गरिएको एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nSIM बदल्दा तपाईंको <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> को सेवा रद्द हुने छैन।"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्नुहोस्"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कमा जोडिँदै…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पारिँदै"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"सेवा प्रदायक बदल्न सकिएन"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"कुनै त्रुटि भएकाले यो सेवा प्रदायक बदल्न सकिएन।"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अफ गर्ने हो?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM अफ गर्ने हो?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM अफ गरिँदै<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"मोबाइल नेटवर्क अफ गर्न सकिएन"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"केही चिज गडबड भयो र तपाईंको मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन।"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दुईवटै SIM प्रयोग गर्ने हो?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"यो यन्त्रमा एकैसाथ २ वटा SIM सक्रिय गर्न सकिन्छ। एक पटकमा एउटा मात्र SIM प्रयोग गर्ने क्रम जारी राख्न \"पर्दैन, धन्यवाद\" मा ट्याप गर्नुहोस्।"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"यन्त्र रिस्टार्ट गर्ने हो?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरु गर्न आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्। त्यसपछि तपाईं अर्को SIM हाल्न सक्नुहुन्छ।"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"जारी राख्नुहोस्"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"रिस्टार्ट गर्नुहोस्"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"पर्दैन, धन्यवाद"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"बदल्नुहोस्"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM सक्रिय गर्न सकिएन"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"फेरि SIM सक्रिय गरी हेर्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"डाउनलोड गरिएको यो SIM मेटाउने हो?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"तपाईंले यो SIM मेटाउनुभयो भने यस यन्त्रबाट <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा हटाइने छ।\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> को सेवा भने रद्द गरिने छैन।"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"मेट्नुहोस्"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लुटुथ अन हुने छ"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"अन"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"अफ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"इन्टरनेट"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"हवाइजहाजका सुरक्षित नेटवर्कहरू"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"हवाइजहाजका सुरक्षित नेटवर्कहरू फेला पार्नुहोस् र तिनमा कनेक्ट गर्नुहोस्"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाइजहाज, हवाइजहाजका सुरक्षित नेटवर्क"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"कल तथा SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi कलिङ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्नुहोस् र कल प्राप्त गर्नुहोस्"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"तपाईं Wi-Fi कलिङ सुविधा प्रयोग गरी केही Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्न र कल प्राप्त गर्न सक्नुहुन्छ।\n\nक्रस-SIM कलिङ सुविधाका मद्दतले तपाईं एउटा SIM को मोबाइल डेटा प्रयोग गरेर अर्को SIM को नम्बरबाट कल गर्न र कल प्राप्त गर्न सक्नुहुन्छ।"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"कलहरू"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml
new file mode 100644
index 0000000..16aba76
--- /dev/null
+++ b/res/values-night/themes_suw.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!-- SUW related themes -->
+<resources>
+ <!-- DayNight themes -->
+ <style name="GlifTheme.DayNight" parent="GlifTheme" />
+ <style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
+ <style name="GlifV3Theme.DayNight" parent="GlifV3Theme" />
+ <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />
+ <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />
+ <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Transparent" />
+ <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat" />
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8c013e2..cd2fe4b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Meldingen automatisch rangschikken op relevantie"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare meldingsfeedback"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Aanpassingen aan meldingen aangeven en de optie weergeven om feedback te geven aan het systeem"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Belang van meldingen resetten"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Door de gebruiker gewijzigde instellingen voor belang resetten en de meldingenassistent toestaan om de prioriteit te bepalen"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde acties en antwoorden"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Voorgestelde acties en antwoorden automatisch weergeven"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Recente en gesnoozede meldingen weergeven"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niet beschikbaar wanneer verbonden met <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Meer bekijken"</string>
<string name="see_less" msgid="2642392725363552793">"Minder weergeven"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> inschakelen?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Simkaart inschakelen?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Overschakelen naar simkaart gebruiken?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Er kan slechts 1 gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt, wordt de service van <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> niet geannuleerd."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbinding maken met netwerk…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan provider niet wijzigen"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"De provider kan niet worden gewijzigd vanwege een fout."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> uitschakelen?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Simkaart uitschakelen?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Simkaart uitschakelen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan provider niet uitschakelen"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan provider niet uitschakelen"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Er is iets misgegaan. Je provider kan niet worden uitgeschakeld."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 simkaarten gebruiken?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Op dit apparaat kunnen 2 simkaarten tegelijk actief zijn. Tik op \'Nee, bedankt\' als je 1 simkaart tegelijk wilt blijven gebruiken."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Apparaat opnieuw opstarten?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Start je apparaat opnieuw op om aan de slag te gaan. Daarna kun je nog een simkaart toevoegen."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Doorgaan"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Opnieuw opstarten"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, bedankt"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Overschakelen"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan simkaart niet activeren"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwijder de simkaart en plaats deze opnieuw. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer de simkaart weer in te schakelen. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Deze gedownloade simkaart wissen?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Als deze simkaart wordt gewist, wordt de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-service van dit apparaat verwijderd.\n\nDe service voor <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> wordt niet geannuleerd."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Wissen"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wordt ingeschakeld"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aan"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Uit"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Simkaarten"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Netwerken die geschikt zijn voor vliegtuigen"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Netwerken vinden en gebruiken die geschikt zijn voor vliegtuigen"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, geschikt voor vliegtuigen"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Gesprekken en sms\'jes"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Bellen via wifi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Bellen en gebeld worden via niet-providernetwerken zoals wifi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Met bellen via wifi kun je bellen en gebeld worden via niet-providernetwerken zoals bepaalde wifi-netwerken.\n\nMet cross-sim-bellen kun je de mobiele data van een simkaart gebruiken om te bellen en gebeld te worden via een andere simkaart."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Gesprekken"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 326e99b..1530dee 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ପ୍ରାସଙ୍ଗିକତା ହିସାବରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ରାଙ୍କ୍ ଦେଇଥାଏ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିର ମତାମତ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ଏହା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ କରାଯାଇଥିବା ଆଡଜଷ୍ଟମେଣ୍ଟଗୁଡ଼ିକୁ ସୂଚିତ କରେ ଏବଂ ସିଷ୍ଟମକୁ ମତାମତ ଦେବାର ବିକଳ୍ପ ଦେଖାଏ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"ବିଜ୍ଞପ୍ତି ଗୁରୁତ୍ୱ ରିସେଟ୍ କରନ୍ତୁ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବଦଳାଯାଇଥିବା ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ସେଟିଂସକୁ ରିସେଟ୍ କରନ୍ତୁ ଓ ବିଜ୍ଞପ୍ତି ଆସିଷ୍ଟାଣ୍ଟକୁ ପ୍ରାଥମିକତା ଦେବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ପ୍ରସ୍ତାବିତ କାର୍ଯ୍ୟ ଏବଂ ପ୍ରତ୍ୟୁତ୍ତରଗୁଡ଼ିକ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ସ୍ୱଚାଳିତ ଭାବେ ପରାମର୍ଶ କରାଯାଇଥିବା କାର୍ଯ୍ୟ ଏବଂ ଉତ୍ତରଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ବର୍ତ୍ତମାନର ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
@@ -3574,10 +3576,10 @@
<string name="important_conversations" msgid="1233893707189659401">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"ବାର୍ତ୍ତାଳାପ ବିଭାଗର ଶୀର୍ଷରେ ଏବଂ ଫ୍ଲୋଟିଂ ବବଲଗୁଡ଼ିକ ଭାବେ ଦେଖାନ୍ତୁ"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"ବାର୍ତ୍ତାଳାପ ବିଭାଗର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ"</string>
- <string name="other_conversations" msgid="551178916855139870">"ଅଣ-ପ୍ରାଥମିକତା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
+ <string name="other_conversations" msgid="551178916855139870">"ପ୍ରାଥମିକତା ନଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକରେ ଆପଣ କରିଥିବା ପରିବର୍ତ୍ତନଗୁଡ଼ିକ"</string>
<string name="recent_conversations" msgid="471678228756995274">"ବର୍ତ୍ତମାନର ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ଏବେର ସେଟିଂସ୍ ଖାଲି କର"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ବର୍ତ୍ତମାନର ଖାଲି କର"</string>
<string name="clear" msgid="5092178335409471100">"ଖାଲି କରନ୍ତୁ"</string>
<string name="important_bubble" msgid="7911698275408390846">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକୁ ବବଲ୍ କରନ୍ତୁ"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପୁଲ୍-ଡାଉନ୍ ସେଡର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ। ଆପଣ ସେଗୁଡ଼ିକୁ ବବଲ୍ ଭାବେ ମଧ୍ୟ ସେଟ୍ କରିପାରିବେ ଏବଂ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ ବାଧା ଦେଇପାରିବେ।"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
<string name="see_more" msgid="7499355691042812723">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
<string name="see_less" msgid="2642392725363552793">"କମ୍ ଦେଖନ୍ତୁ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ଚାଲୁ କରିବେ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMକୁ ଚାଲୁ କରିବେ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM କାର୍ଡ ବ୍ୟବହାର କରିବାକୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ଥରକେ କେବଳ ଗୋଟିଏ ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\nସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ନେଟୱାର୍କ ସହ ସଂଯୋଗ କରାଯାଉଛି…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ।"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ବନ୍ଦ କରିବେ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ବନ୍ଦ କରିବେ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ବନ୍ଦ କରାଯାଉଛି<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"କ୍ୟାରିଅରକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"କିଛି ତ୍ରୁଟି ହୋଇଥିବାରୁ ଆପଣଙ୍କ ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିଲା ନାହିଁ।"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2ଟି SIM ବ୍ୟବହାର କରିବେ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ଏହି ଡିଭାଇସରେ ଏକ ସମୟରେ 2ଟି SIM ସକ୍ରିୟ ରହିପାରିବ। ଥରକେ 1ଟି SIM ବ୍ୟବହାର କରିବା ଜାରି ରଖିବାକୁ, \"ନା, ଧନ୍ୟବାଦ\"ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରିବେ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ଆରମ୍ଭ କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ। ତା\'ପରେ ଆପଣ ଅନ୍ୟ ଏକ SIM ଯୋଗ କରିପାରିବେ।"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ଜାରି ରଖନ୍ତୁ"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ନା, ଧନ୍ୟବାଦ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ ନାହିଁ"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMକୁ ପୁଣି ଚାଲୁ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଏହି SIMକୁ ଖାଲି କରିବେ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ଏହି SIMକୁ ଖାଲି କରିବା ଦ୍ୱାରା, ଏହି ଡିଭାଇସରୁ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ସେବାକୁ କାଢ଼ି ଦିଆଯିବ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ପାଇଁ ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ଖାଲି କରନ୍ତୁ"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ହେବ"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ଚାଲୁ ଅଛି"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ବନ୍ଦ ଅଛି"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ଇଣ୍ଟରନେଟ୍"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMଗୁଡ଼ିକ"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଖୋଜି ତାହା ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ଏୟାରପ୍ଲେନ୍, ଏୟାରପ୍ଲେନ୍-ସେଫ୍"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"କଲ୍ ଓ SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ୱାଇ-ଫାଇ କଲିଂ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ୱାଇ-ଫାଇ ପରି ନନ୍-କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରନ୍ତୁ ଓ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ୱାଇ-ଫାଇ କଲିଂ ଆପଣଙ୍କୁ କେତେକ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ପରି ନନ୍-କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରିବା ଓ ପ୍ରାପ୍ତ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।\n\nକ୍ରସ୍-SIM କଲିଂ ଆପଣଙ୍କୁ ଗୋଟିଏ SIMର ମୋବାଇଲ ଡାଟା ବ୍ୟବହାର କରି ଅନ୍ୟ ଏକ SIMରୁ କଲ୍ କରିବା ଓ ସେଥିରେ କଲ୍ ପ୍ରାପ୍ତ କରିବାର ଅନୁମତି ଦେଇଥାଏ।"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"କଲଗୁଡ଼ିକ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index b59e2b8..63b9967 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ਢੁਕਵੇਂਪਣ ਮੁਤਾਬਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦਰਜਾਬੰਦ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਸੰਬੰਧੀ ਵਿਚਾਰ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ਸੂਚਨਾ ਵਿੱਚ ਕੀਤੀਆਂ ਗਈਆਂ ਵਿਵਸਥਾਵਾਂ ਬਾਰੇ ਸੂਚਿਤ ਕਰੋ ਅਤੇ ਸਿਸਟਮ ਨੂੰ ਵਿਚਾਰ ਮੁਹੱਈਆ ਕਰਨ ਦਾ ਵਿਕਲਪ ਦਿਖਾਓ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"ਸੂਚਨਾ ਦੀ ਮਹੱਤਤਾ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"ਵਰਤੋਂਕਾਰਾਂ ਵੱਲੋਂ ਬਦਲੀਆਂ ਗਈਆਂ ਮਹੱਤਤਾ ਵਾਲੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ ਅਤੇ ਸੂਚਨਾ ਸਹਾਇਕ ਨੂੰ ਤਰਜੀਹ ਦੇਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬਾਂ ਨੂੰ ਦਿਖਾਓ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ਹਾਲੀਆਂ ਅਤੇ ਸਨੂਜ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ਟੈਬਲੈੱਟ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ਡੀਵਾਈਸ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ਸੰਕਟਕਾਲੀਨ SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਤੇਜ਼ੀ ਨਾਲ 5 ਵਾਰ ਦੱਬ ਕੇ ਸੰਕਟਕਾਲੀਨ SOS ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰੋ।"</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"ਚਿਤਾਵਨੀ ਧੁਨੀ"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਸੁਚੇਤਨਾ ਦਿਓ"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="see_more" msgid="7499355691042812723">"ਹੋਰ ਦੇਖੋ"</string>
<string name="see_less" msgid="2642392725363552793">"ਘੱਟ ਵੇਖੋ"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ਕੀ ਸਿਮ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ਕੀ ਤੁਸੀਂ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ਕੀ ਸਿਮ ਕਾਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ਕੀ ਸਿਮ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ਸਿਮ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ਕੀ 2 ਸਿਮ ਵਰਤਣੇ ਹਨ?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਇੱਕੋ ਵੇਲੇ 2 ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦੇ ਹਨ। ਇੱਕੋ ਵੇਲੇ 1 ਸਿਮ ਵਰਤਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ \"ਨਹੀਂ ਧੰਨਵਾਦ\" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ। ਫਿਰ ਤੁਸੀਂ ਕੋਈ ਹੋਰ ਸਿਮ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ਜਾਰੀ ਰੱਖੋ"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"ਸਵਿੱਚ ਕਰੋ"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ਸਿਮ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ਕੀ ਇਹ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਮਿਟਾਉਣਾ ਹੈ?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ਇਹ ਸਿਮ ਮਿਟਾਉਣ ਨਾਲ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ਸੇਵਾ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟ ਜਾਂਦੀ ਹੈ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ਲਈ ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ।"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ਮਿਟਾਓ"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋਵੇਗਾ"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ਚਾਲੂ"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ਬੰਦ"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ਇੰਟਰਨੈੱਟ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ਸਿਮ"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨੈੱਟਵਰਕ"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭੋ ਅਤੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ, ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ਕਾਲਾਂ ਅਤੇ SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ਵਾਈ-ਫਾਈ ਵਰਗੇ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਕਾਲਾਂ ਕਰੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਤੁਹਾਨੂੰ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ, ਜਿਵੇਂ ਕਿ ਕੁਝ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ, \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ।\n\nਕ੍ਰਾਸ-ਸਿਮ ਕਾਲਿੰਗ ਤੁਹਾਨੂੰ ਕਿਸੇ ਹੋਰ ਸਿਮ ਤੋਂ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕਿਸੇ ਸਿਮ ਦੇ ਮੋਬਾਈਲ ਡਾਟੇ ਦੀ ਮਦਦ ਲੈਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ।"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ਕਾਲਾਂ"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ec92580..ab01a08 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2768,7 +2768,7 @@
<string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
<string name="tts_play" msgid="2945513377250757221">"Odtwórz"</string>
<string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
- <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Połączenie adaptacyjne"</string>
+ <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Łączność adaptacyjna"</string>
<string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Wydłuża czas pracy na baterii i poprawia wydajność urządzenia dzięki automatycznemu zarządzaniu połączeniami sieciowymi"</string>
<string name="credentials_title" msgid="7535942196886123656">"Magazyn danych logowania"</string>
<string name="credentials_install" msgid="3933218407598415827">"Zainstaluj certyfikat"</string>
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatycznie porządkuj powiadomienia według trafności"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Opinia na temat powiadomień adaptacyjnych"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaż zmiany w ustawieniach powiadomień oraz wyświetl opcję przesyłania opinii do systemu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetuj ważność powiadomień"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Zresetuj zmienione przez użytkownika ustawienia ważności i zezwól na ustalenie priorytetów przez asystenta powiadomień"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Sugerowane działania i odpowiedzi"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatycznie pokazuj sugerowane działania i odpowiedzi"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Pokaż ostatnie i odłożone powiadomienia"</string>
@@ -3665,7 +3667,7 @@
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Wyświetlają się u góry sekcji rozmów jako pływające dymki"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Wyświetlają się u góry sekcji rozmów"</string>
<string name="other_conversations" msgid="551178916855139870">"Rozmowy inne niż priorytetowe"</string>
- <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy, w których wprowadzono zmiany"</string>
+ <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy z Twoimi zmianami"</string>
<string name="recent_conversations" msgid="471678228756995274">"Ostatnie rozmowy"</string>
<string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Wyczyść ostatnie"</string>
<string name="clear" msgid="5092178335409471100">"Wyczyść"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niedostępne po połączeniu z siecią <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Pokaż więcej"</string>
<string name="see_less" msgid="2642392725363552793">"Pokaż mniej"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Włączyć usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Włączyć kartę SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Przełączyć na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Przełączyć na korzystanie z karty SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Tylko 1 karta SIM może być aktywna w danym momencie.\n\nPrzełączenie na usługę <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nie spowoduje rezygnacji z usługi <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Tylko 1 pobrana karta SIM może być aktywna w danym momencie.\n\nPrzełączenie na usługę <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nie spowoduje rezygnacji z usługi <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Tylko 1 karta SIM może być aktywna w danym momencie.\n\nPrzełączenie usługi nie spowoduje rezygnacji z usługi <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Przełącz na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Łączę się z siecią…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Przełączam na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nie można przełączyć operatora"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nie można przełączyć operatora z powodu błędu."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Wyłączyć usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Wyłączyć kartę SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Wyłączam kartę SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nie można wyłączyć operatora"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nie można wyłączyć operatora"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Coś poszło nie tak i nie udało się wyłączyć operatora."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Używać 2 kart SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na tym urządzeniu mogą być jednocześnie aktywne 2 karty SIM. Aby nadal używać 1 karty SIM, kliknij „Nie”."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Uruchomić urządzenie ponownie?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Aby rozpocząć, uruchom ponownie urządzenie. Potem możesz dodać kolejną kartę SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Dalej"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Uruchom ponownie"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Przełącz"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nie można aktywować karty SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Wyjmij kartę SIM i włóż ją ponownie. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Spróbuj ponownie włączyć kartę SIM. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Wykasować dane z tej pobranej karty SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Wykasowanie danych z tej karty SIM spowoduje usunięcie usługi <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> z tego urządzenia.\n\nUsługa dostarczana przez operatora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nie zostanie anulowana."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Skasuj"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zostanie włączony Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Włączony"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Wyłączony"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Karty SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Sieci bezpieczne w trybie samolotowym"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Znajdź sieci bezpieczne w trybie samolotowym i połącz się z nimi"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolot, bezpieczny w trybie samolotowym"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Połączenia i SMS-y"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Połączenia przez Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w sieciach Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Połączenia przez Wi-Fi umożliwiają nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w niektórych sieciach Wi‑Fi.\n\nPołączenia między kartami SIM pozwalają wykorzystać mobilną transmisję danych z jednej karty SIM do nawiązywania i odbierania połączeń z drugiej."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Połączenia"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS-y"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a124c7d..139fc8d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1841,7 +1841,7 @@
<string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Levante o dedo ao terminar"</string>
<string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
<string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Padrão registrado"</string>
- <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão novamente para confirmar"</string>
+ <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão de novo para confirmar"</string>
<string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Seu novo padrão de desbloqueio"</string>
<string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Confirmar"</string>
<string name="lockpattern_restart_button_text" msgid="255339375151895998">"Desenhar novamente"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Redefinir importância de notificações"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Redefina as configurações de importância mudadas pelo usuário e permita que o assistente de notificação decida a prioridade"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ativar o chip?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Mudar para a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Começar a usar o chip?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Somente um chip pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Somente um chip transferido por download pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Somente um chip pode estar ativo por vez.\n\nMudar de operadora não cancelará o serviço da <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectando à rede…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mudando para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não foi possível mudar a operadora"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Devido a um erro, não foi possível mudar a operadora."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar a operadora"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não foi possível desativar a operadora"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Usar dois chips?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter dois chips ativos ao mesmo tempo. Para continuar usando um chip por vez, toque em \"Agora não\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Reiniciar dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie seu dispositivo. Depois, você pode adicionar outro chip."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Limpar este chip transferido por download?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"A limpeza do chip remove o serviço da <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nO serviço da <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não será cancelado."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Limpar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Ativar"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Encontre redes seguras para aviões e se conecte a elas"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Faça e receba chamadas por redes que não sejam a da operadora, como Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes que não sejam a da operadora, como algumas redes Wi-Fi.\n\nA chamada entre chips permite que você use os dados móveis de um chip para fazer e receber chamadas de outro."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c68cc16..5c4e5a8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifique as notificações por relevância automaticamente."</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sobre as notificações adaptáveis"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar ajustes efetuados às notificações e mostrar a opção para fornecer feedback ao sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Repor a importância das notificações"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reponha as definições de importância alteradas pelo utilizador e permita que o assistente de notificações defina prioridades."</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"São apresentadas automaticamente respostas e ações sugeridas."</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Apresentar notificações recentes e suspensas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando ligado a <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
<string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Pretende ativar o operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Pretende ativar o SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Pretende mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Pretende mudar para a utilização do cartão SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Só pode ter um SIM ativo de cada vez.\n\nMudar para o operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancela o seu serviço no operador <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Só pode ter um SIM transferido ativo de cada vez.\n\nMudar para o operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancela o seu serviço no operador <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Só pode ter um SIM ativo de cada vez.\n\nMudar não cancela o seu serviço no operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"A estabelecer ligação à rede…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"A mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não é possível mudar de operador"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Não é possível mudar de operador devido a um erro."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Pretende desativar o operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Pretende desativar o SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"A desativar o SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar o operador"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não é possível desativar o operador"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ocorreu um erro e não foi possível desativar o operador."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Pretende utilizar 2 SIMs?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter 2 SIMs ativos em simultâneo. Para continuar a utilizar 1 SIM de cada vez, toque em \"Não, obrigado\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Pretende reiniciar o dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie o dispositivo. Em seguida, pode adicionar outro SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Não, obrigado"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não é possível ativar o SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o SIM e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Experimente ativar o SIM novamente. Se o problema continuar, reinicie o dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Pretende apagar este SIM transferido?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Se apagar este SIM, o serviço do operador <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> será removido deste dispositivo.\n\nO serviço do operador <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não é cancelado."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Apagar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Ligado"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desligado"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Procure e ligue-se a redes seguras para aviões."</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, seguro para aviões"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Fazer e receber chamadas através de redes sem operador móvel como as redes Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"As Chamadas Wi-Fi permitem-lhe fazer e receber chamadas através de redes sem operador móvel, tais como redes Wi‑Fi.\n\nAs chamadas com vários cartões SIM permitem-lhe aproveitar os dados móveis de um SIM para fazer e receber chamadas de outro SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a124c7d..139fc8d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1841,7 +1841,7 @@
<string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Levante o dedo ao terminar"</string>
<string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
<string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Padrão registrado"</string>
- <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão novamente para confirmar"</string>
+ <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão de novo para confirmar"</string>
<string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Seu novo padrão de desbloqueio"</string>
<string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Confirmar"</string>
<string name="lockpattern_restart_button_text" msgid="255339375151895998">"Desenhar novamente"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Redefinir importância de notificações"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Redefina as configurações de importância mudadas pelo usuário e permita que o assistente de notificação decida a prioridade"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
<string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ativar o chip?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Mudar para a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Começar a usar o chip?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Somente um chip pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Somente um chip transferido por download pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Somente um chip pode estar ativo por vez.\n\nMudar de operadora não cancelará o serviço da <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectando à rede…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mudando para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não foi possível mudar a operadora"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Devido a um erro, não foi possível mudar a operadora."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar a operadora"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não foi possível desativar a operadora"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Usar dois chips?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter dois chips ativos ao mesmo tempo. Para continuar usando um chip por vez, toque em \"Agora não\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Reiniciar dispositivo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie seu dispositivo. Depois, você pode adicionar outro chip."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Limpar este chip transferido por download?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"A limpeza do chip remove o serviço da <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nO serviço da <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não será cancelado."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Limpar"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Ativar"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Encontre redes seguras para aviões e se conecte a elas"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Faça e receba chamadas por redes que não sejam a da operadora, como Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes que não sejam a da operadora, como algumas redes Wi-Fi.\n\nA chamada entre chips permite que você use os dados móveis de um chip para fazer e receber chamadas de outro."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 36b2a87..e335f8f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Poziționați automat notificările după relevanță"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback pentru notificările adaptabile"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicați ajustările notificărilor și afișați opțiunea de a oferi feedback pentru sistem"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetați importanța notificărilor"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetați setările de importanță schimbate de utilizator și permiteți-i asistentului de notificări să stabilească priorități"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acțiuni și răspunsuri sugerate"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afișați automat acțiunile și răspunsurile sugerate"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Afișați notificările recente și pe cele amânate"</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponibil când este conectat la <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Vedeți mai multe"</string>
<string name="see_less" msgid="2642392725363552793">"Afișați mai puține"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activați <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activați SIM-ul?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Treceți la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Folosiți cardul SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Doar un SIM poate fi activ odată.\n\nCând comutați la <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nu anulați serviciul <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Doar un SIM descărcat poate fi activ odată.\n\nCând comutați la <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nu anulați serviciul <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Doar un SIM poate fi activ odată.\n\nCând comutați, nu anulați serviciul <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Treceți la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Se conectează la rețea…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Se trece la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nu puteți schimba operatorul"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nu puteți schimba operatorul din cauza unei erori."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Dezactivați <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Dezactivați SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Se dezactivează cardul SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nu se poate dezactiva operatorul"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nu se poate dezactiva operatorul"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"A apărut o eroare și operatorul dvs. nu a putut fi dezactivat."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Folosiți două carduri SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Acest dispozitiv poate avea două carduri SIM active simultan. Pentru a folosi în continuare câte un card SIM odată, atingeți „Nu, mulțumesc”."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Reporniți dispozitivul?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Pentru a începe, reporniți dispozitivul. Apoi puteți adăuga un alt SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Continuați"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reporniți"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nu, mulțumesc"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Schimbați"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nu se poate activa SIM-ul"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Scoateți SIM-ul și introduceți-l din nou. Dacă problema persistă, reporniți dispozitivul."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Încercați din nou să activați SIM-ul. Dacă problema persistă, reporniți dispozitivul."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Ștergeți acest SIM descărcat?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Dacă ștergeți acest SIM, veți elimina serviciul <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de pe acest dispozitiv.\n\nServiciile <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nu vor fi anulate."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ștergeți"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se va activa"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Activat"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Dezactivat"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Carduri SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Rețele sigure pentru avioane"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Găsiți rețele sigure pentru avioane și conectați-vă la ele"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigure pentru avion"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Apeluri și SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Apelare prin Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Inițiați și primiți apeluri prin rețele diferite de cele de operator, cum ar Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Cu ajutorul apelării prin Wi-Fi, puteți să inițiați și să primiți apeluri prin rețele diferite de cele de operator, cum ar fi rețelele Wi‑Fi.\n\nApelurile pe mai multe carduri SIM vă ajută să profitați de datele mobile ale unui card SIM pentru a iniția și a primi apeluri de pe alt card SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Apeluri"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c0aa9ce..997e57d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2737,7 +2737,7 @@
<string name="menu_duration_6h" msgid="2843895006519153126">"6 часов"</string>
<string name="menu_duration_12h" msgid="9206922888181602565">"12 часов"</string>
<string name="menu_duration_1d" msgid="8538390358158862330">"1 день"</string>
- <string name="menu_show_system" msgid="3780310384799907818">"Показать системные процессы"</string>
+ <string name="menu_show_system" msgid="3780310384799907818">"Показать системные"</string>
<string name="menu_hide_system" msgid="5197937451381420622">"Скрыть системные процессы"</string>
<string name="menu_show_percentage" msgid="6143205879027928330">"Показать в процентах"</string>
<string name="menu_use_uss" msgid="1663914348353623749">"Использовать USS"</string>
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматически присваивать важность уведомлениям по релевантности"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзывы об адаптивных уведомлениях"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Показывает, какой статус назначен уведомлению, и предлагает оставить отзыв"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Сбросить настройки важности"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Сбросить настройки важности, измененные пользователем, и разрешить определять приоритет приложению для уведомлений"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Рекомендуемые действия и ответы"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматически показывать рекомендуемые действия и ответы"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Показывать недавние и отложенные уведомления"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Ещё"</string>
<string name="see_less" msgid="2642392725363552793">"Скрыть"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Включить <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Включить SIM-карту?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Переключиться на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Переключиться на SIM-карту?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нельзя использовать несколько SIM-карт одновременно.\n\nВы можете переключиться на SIM-карту \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\". Это действие не повлияет на ваш тарифный план у оператора \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нельзя использовать несколько скачанных SIM-карт одновременно.\n\nВы можете переключиться на SIM-карту \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\". Это действие не повлияет на ваш тарифный план у оператора \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нельзя использовать несколько SIM-карт одновременно.\n\nПереключение между SIM-картами не повлияет на ваш тарифный план у оператора \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\"."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Переключиться на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Подключение к сети…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Переключение на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Произошла ошибка"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не удалось сменить оператора."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Отключить оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Отключить SIM-карту?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Отключение SIM-карты<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Произошла ошибка"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Произошла ошибка"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Не удалось отключить оператора."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Использовать две SIM-карты?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На этом устройстве можно использовать сразу две SIM-карты. Если вам достаточно одной, нажмите \"Нет, спасибо\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Перезапустить устройство?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Чтобы начать, перезапустите устройство. После этого вы сможете добавить ещё одну SIM-карту."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Продолжить"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустить"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Нет, спасибо"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Переключиться"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не удалось активировать SIM-карту"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извлеките и снова вставьте SIM-карту. Если проблема не исчезнет, перезапустите устройство."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Попробуйте включить SIM-карту ещё раз. Если проблема не исчезнет, перезапустите устройство."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Удалить данные скачанной SIM-карты?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Если вы удалите данные этой SIM-карты, оператор \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\" перестанет обслуживать устройство.\n\nЭто не повлияет на тарифный план оператора \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\"."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Удалить"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будет включен модуль Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Включено"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Отключено"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Сети, безопасные в самолете"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Найти и подключиться к сети, безопасной в самолете"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасность для самолета"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Звонки и SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Звонки по Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Совершать и принимать вызовы через такие сети, как Wi-Fi, а не операторов связи"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Благодаря функции \"Звонки по Wi-Fi\" вы можете совершать и принимать вызовы через некоторые сети Wi-Fi, а не операторов связи.\n\nБлагодаря перекрестной работе с SIM-картами можно на одной из них совершать и принимать вызовы через мобильный Интернет, предоставляемый другой."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Звонки"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a9b9874..aeceaa8 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"අදාළත්වය අනුව ස්වයංක්රියව දැනුම් දීම් ශ්රේණිගත කරන්න"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"අනුවර්තී දැනුම් දීම් ප්රතිපෝෂණය"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"දැනුම් දීම් වෙත කළ ගැළපීම් දක්වා පද්ධතිය වෙත ප්රතිපෝෂණ ලබා දීමට විකල්පය පෙන්වන්න"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"දැනුම්දීම් වැදගත්කම යළි සකසන්න"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"පරිශීලක වෙනස් කළ වැදගත් සැකසීම් යළි සකසන්න සහ ප්රමුඛතාව සැකසීමට දැනුම්දීම් සහායකට ඉඩ දෙන්න"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"යෝජිත ක්රියා සහ පිළිතුරු"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"යෝජිත ක්රියා සහ පිළිතුරු ස්වයංක්රීයව පෙන්වන්න"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"මෑත සහ මඳක් නිද්රාවට පත් කළ දැනුම් දීම් පෙන්වන්න"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> වෙත සම්බන්ධ වූ විට නොමැත"</string>
<string name="see_more" msgid="7499355691042812723">"තව බලන්න"</string>
<string name="see_less" msgid="2642392725363552793">"අඩුවෙන් බලන්න"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ක්රියාත්මක කරන්නද?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ක්රියාත්මක කරන්නද?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වන්නද?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM කාඩ්පත භාවිතයට මාරු වන්නද?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"වරකට SIM එකක් පමණක් සක්රිය කළ හැකිය.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වීම ඔබේ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> සේවය අවලංගු නොකරනු ඇත."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"වරකට බාගත් SIM එකක් පමණක් සක්රිය විය හැකිය.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වීම ඔබේ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> සේවය අවසන් නොකරනු ඇත."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"වරකට SIM එකක් පමණක් සක්රිය කළ හැකිය.\n\nමාරු වීම ඔබේ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> සේවය අවලංගු නොකරනු ඇත."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වන්න"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ජාලයට සම්බන්ධ වෙමින්…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වෙමින්"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"වාහකය මාරු කළ නොහැකිය"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"දෝෂයක් හේතුවෙන් වාහකය මාරු කළ නොහැකිය."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ක්රියාවිරහිත කරන්නද?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ක්රියාවිරහිත කරන්නද?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ක්රියාවිරහිත කරමින්<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"වාහකය අබල කළ නොහැකිය"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"වාහකය අබල කළ නොහැකිය"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"යම් දෙයක් වැරදී ගිය අතර ඔබේ වාහකය අබල කළ නොහැකි විය."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"SIM 2ක් භාවිත කරන්නද?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"මෙම උපාංගයට එකවර SIM 2ක් ක්රියාත්මකව තිබිය හැකිය. දිගටම වරකට 1 SIM එකක් භාවිත කිරීමට, \"එපා, ස්තුතියි\" තට්ටු කරන්න."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"උපාංගය යළි අරඹන්නද?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ආරම්භ කිරීමට, ඔබේ උපාංගය යළි අරඹන්න. පසුව ඔබට වෙනත් SIM එකක් එක් කළ හැකිය."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ඉදිරියට යන්න"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"යළි අරඹන්න"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"එපා, ස්තුතියි"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"මාරු වන්න"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM එක සක්රිය කිරීමට නොහැකිය"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM එක ඉවත් කර එය නැවත ඇතුළු කරන්න. ප්රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"නැවත SIM එක ක්රියාත්මක කිරීමට උත්සාහ කරන්න. ප්රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"මෙම බාගත් SIM මකන්නද?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"මෙම SIM මැකීමෙන් මෙම උපාංගයෙන් <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> සේවාව ඉවත් කරයි.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> සඳහා වන සේවාව අවලංගු නොකෙරේ."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"මකන්න"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"බ්ලූටූත් ක්රියාත්මක වනු ඇත"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ක්රියාත්මකයි"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ක්රියාවිරහිතයි"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"අන්තර්ජාලය"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ගුවන් යානා ආරක්ෂිත ජාල"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ගුවන් යානා ආරක්ෂිත ජාල සොයන්න සහ සම්බන්ධ වන්න"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ගුවන් යානා, ගුවන් යානා ආරක්ෂිත"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"ඇමතුම් & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ඇමතීම"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi‑Fi වැනි වාහක නොවන ජාල හරහා ඇමතුම් සිදු කරන්න සහ ලබන්න"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"සමහර Wi-Fi ජාල වැනි වාහක නොවන ජාල හරහා ඇමතුම් ලබා ගැනීමට සහ ලැබීමට Wi-Fi ඇමතීම ඔබට ඉඩ දෙයි.\n\nහරස් SIM ඇමතුම් ඔබට SIM එකක ජංගම දත්ත වෙනත් SIM එකකින් ඇමතුම් සිදු කිරීමට සහ ලැබීමට ඉඩ දෙයි."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"ඇමතුම්"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 90337ee..6081786 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky zoradiť upozornenia podľa relevancie"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Spätná väzba k prispôsobivým upozorneniam"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uveďte úpravy upozornení a zobrazujte možnosť poskytnúť spätnú väzbu k systému"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetovanie dôležitosti upozornenia"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetovanie nastavení dôležitosti zmenených používateľom a povolenie priorizácie v asistentovi upozornení"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akcie a odpovede"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovať navrhované akcie a odpovede"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Zobrazovanie nedávnych a stlmených upozornení"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nie je k dispozícii pri pripojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Zobraziť viac"</string>
<string name="see_less" msgid="2642392725363552793">"Zobraziť menej"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Chcete zapnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Chcete zapnúť SIM kartu?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Chcete prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chcete používať SIM kartu?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPoužitím inej možnosti nezrušíte službu operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Pripája sa k sieti…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prepína sa na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operátora sa nepodarilo prepnúť"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operátora sa nepodarilo prepnúť, pretože sa vyskytla chyba."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Chcete vypnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Chcete vypnúť SIM kartu?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypína sa SIM karta<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operátor sa nedá deaktivovať"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operátora sa nepodarilo deaktivovať"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Vyskytol sa problém a operátora sa nepodarilo deaktivovať."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Chcete používať dve SIM karty?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zariadení môžu byť naraz aktívne dve SIM karty. Ak chcete ďalej používať len jednu, klepnite na Nie, ďakujem."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Chcete reštartovať zariadenie?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Začnite reštartovaním zariadenia. Potom môžete pridať ďalšiu SIM kartu."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Pokračovať"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Reštartovať"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie, vďaka"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Prepnúť"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu sa nepodarilo aktivovať"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyberte SIM kartu a znova ju vložte. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Skúste SIM kartu znova zapnúť. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Chcete vymazať túto stiahnutú SIM kartu?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Vymazaním tejto SIM karty odstránite službu operátora <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> z tohto zariadenia.\n\nSlužba operátora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sa nezruší."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vymazať"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne sa Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Zapnuté"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuté"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Siete, ktoré je možné používať v lietadle"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Nájdite siete, ktoré je možné používať v lietadle, a pripojte sa k nim"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lietadlo, možné používať v lietadle"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Hovory a SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Volanie cez Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Volajte a prijímajte hovory cez siete bez operátorov, ako je Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Volanie cez Wi-Fi vám umožňuje volať a prijímať hovory cez siete bez operátorov, ako sú niektoré siete Wi‑Fi.\n\nVolanie naprieč SIM kartami vám umožňuje pomocou mobilných dát jednej SIM karty volať a prijímať hovory z druhej SIM karty."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Hovory"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b03b723..12eef05 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Samodejna razvrstitev obvestil glede na ustreznost"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivih obvestilih"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaži spremembe nastavitev obvestil in možnost posredovanja povratnih informacij sistemu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ponastavitev pomembnosti obvestil"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ponastavitev uporabniško spremenjenih nastavitev pomembnosti in omogočanje prednostne obravnave Pomočniku za obvestila"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predlagana dejanja in odgovori"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Samodejen prikaz predlaganih dejanj in odgovorov"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Prikaži nedavna in preložena obvestila"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ni na voljo ob vzpostavljeni povezavi z operaterjem <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Pokaži več"</string>
<string name="see_less" msgid="2642392725363552793">"Pokaži manj"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Želite vklopiti storitev operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Želite vklopiti kartico SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite preklopiti na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite preklopiti na uporabo kartice SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hkrati je lahko aktivna samo ena kartica SIM.\n\nČe preklopite na operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, ne boste preklicali storitve operaterja <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hkrati je lahko aktivna samo ena prenesena kartica SIM.\n\nČe preklopite na operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, ne boste preklicali storitve operaterja <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hkrati je lahko aktivna samo ena kartica SIM.\n\nČe preklopite, ne boste preklicali storitve operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Preklopi na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezovanje z omrežjem …"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Preklapljanje na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaterja ni mogoče preklopiti"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaterja ni mogoče preklopiti zaradi napake."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite izklopiti storitev operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite izklopiti kartico SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Izklapljanje kartice SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaterja ni mogoče onemogočiti"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaterja ni mogoče onemogočiti"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Prišlo je do napake, operaterja ni bilo mogoče onemogočiti."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite uporabljati dve kartici SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tej napravi sta lahko hkrati aktivni dve kartici SIM. Če želite še naprej uporabljati samo eno kartico SIM, se dotaknite »Ne, hvala«."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite znova zagnati napravo?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Če želite začeti, znova zaženite napravo. Nato boste lahko dodali še eno kartico SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Naprej"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Znova zaženi"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Preklopi"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kartice SIM ni mogoče aktivirati"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kartico SIM odstranite in jo znova vstavite. Če s tem ne odpravite težave, znova zaženite napravo."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Poskusite znova vklopiti kartico SIM. Če s tem ne odpravite težave, znova zaženite napravo."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite izbrisati preneseno kartico SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Če izbrišete to kartico SIM, boste iz te naprave odstranili storitev operaterja <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nStoritev operaterja <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne bo preklicana."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Izbriši"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se bo vklopil"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Vklopljeno"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Izklopljeno"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartice SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Omrežja, varna za uporabo v letalu"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Iskanje omrežij, varnih za uporabo v letalu, in povezovanje z njimi"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letalo, varno za uporabo v letalu"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Klici in sporočila SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Klicanje prek Wi‑Fi-ja"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v omrežjih Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Klicanje prek Wi-Fi-ja omogoča opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v nekaterih omrežjih Wi-Fi.\n\nKlicanje ne glede na kartico SIM omogoča, da prenos podatkov v mobilnem omrežju v sklopu ene kartice SIM uporabljate za opravljanje in prejemanje klicev prek druge kartice SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Klici"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Sporočila SMS"</string>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b654713..a930536 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rendit automatikisht njoftimet sipas përshtatshmërisë"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Komentet e njoftimeve me përshtatje"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Trego rregullimet që u bëhen njoftimeve dhe shfaq opsionin për t\'i dhënë komente sistemit"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Rivendos rëndësinë e njoftimeve"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Rivendos cilësimet e rëndësisë që janë ndryshuar nga përdoruesi dhe lejo që asistenti i njoftimeve të caktojë përparësinë"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Veprimet dhe përgjigjet e sugjeruara"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Shfaq automatikisht veprimet dhe përgjigjet e sugjeruara"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Shfaq njoftimet e fundit dhe ato të shtyra"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nuk ofrohet kur është e lidhur me <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Shiko më shumë"</string>
<string name="see_less" msgid="2642392725363552793">"Shiko më pak"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Të aktivizohet <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Të aktivizohet SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Do të kalosh te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Dëshiron të kalosh te përdorimi i kartës SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vetëm një kartë SIM mund të jetë aktive në të njëjtën kohë.\n\nKalimi te <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nuk do ta anulojë shërbimin e <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vetëm një kartë SIM e shkarkuar mund të jetë aktive në të njëjtën kohë.\n\nKalimi te <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nuk do ta anulojë shërbimin e <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vetëm një kartë SIM mund të jetë aktive në të njëjtën kohë.\n\nKalimi nuk do ta anulojë shërbimin e <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Kalo te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Po lidhet me rrjetin…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Po kalon te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operatori nuk mund të ndërrohet"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operatori nuk mund të ndërrohet për shkak të një gabimi."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Të çaktivizohet <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Të çaktivizohet karta SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Po çaktivizohet karta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatori celular nuk mund të çaktivizohet"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatori celular nuk mund të çaktivizohet"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ndodhi një gabim dhe operatori celular nuk mund të çaktivizohet."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Dëshiron të përdorësh 2 karta SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kjo pajisje mund të ketë 2 karta SIM aktive në të njëjtën kohë. Që të vazhdosh të përdorësh 1 kartë SIM në të njëjtën kohë, trokit te \"Jo, faleminderit\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Të riniset pajisja?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Për të filluar, rinise pajisjen tënde. Më pas mund të shtosh një kartë tjetër SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Vazhdo"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Rinis"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Jo, faleminderit"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Ndërro"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Karta SIM nuk mund të aktivizohet"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hiq kartën SIM dhe fute përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Provo të aktivizosh kartën SIM përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Dëshiron ta pastrosh këtë kartë SIM të shkarkuar?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Spastrimi i kësaj karte SIM e heq shërbimin e <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> nga kjo pajisje.\n\nShërbimi për <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nuk do të anulohet."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Spastro"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-i do të aktivizohet"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktiv"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Joaktiv"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Interneti"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartat SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Rrjetet e sigurta për në aeroplan"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Gjej dhe lidhu me rrjete të sigurta për në aeroplan"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplan, të sigurta për në aeroplan"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Telefonatat dhe SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Telefonatë me Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Dërgo e merr telefonata nga rrjete jo të operatorëve të telefonisë, si p.sh. Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Telefonata me Wi-Fi të mundëson dërgimin dhe marrjen e telefonatave përmes rrjeteve jo nga operatorë telefonie, si p.sh. disa rrjete Wi‑Fi.\n\nTelefonata përmes SIM të ndryshme të mundëson shfrytëzimin e të dhënave celular të një SIM për të dërguar e marrë telefonata nga një SIM tjetër."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Telefonatat"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 778952a..2ddc091 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1643,8 +1643,8 @@
<string name="reset_network_complete_toast" msgid="1367872474130621115">"Подешавања мреже су ресетована"</string>
<string name="reset_esim_error_title" msgid="4670073610967959597">"Брисање SIM картица није успело"</string>
<string name="reset_esim_error_msg" msgid="4441504470684307370">"Преузете SIM картице не могу да се обришу због грешке.\n\nРестартујте уређај и пробајте поново."</string>
- <string name="main_clear_title" msgid="277664302144837723">"Обриши све податке (ресетовање на Фабричка подешавања)"</string>
- <string name="main_clear_short_title" msgid="4752094765533020696">"Обриши све податке (ресетовање на Фабричка подешавања)"</string>
+ <string name="main_clear_title" msgid="277664302144837723">"Обриши све податке (фабричка подешавања)"</string>
+ <string name="main_clear_short_title" msgid="4752094765533020696">"Обриши све податке (фабричка подешавања)"</string>
<string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
<string name="main_clear_desc" product="default" msgid="6984348811887162647">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
<string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
@@ -3521,6 +3521,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аутоматски рангира обавештења према релевантности"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратне информације о прилагодљивим обавештењима"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означите подешавања обавештења и прикажите опцију за слање повратних информација систему"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ресетујте важност обавештења"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетујте подешавања важности која је променио корисник и омогућите помоћнику за обавештења да одређује приоритет"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложене радње и одговори"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аутоматски приказује предложене радње и одговоре"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Погледајте недавна и одложена обавештења"</string>
@@ -4926,11 +4928,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно када је успостављена веза са оператером <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Прикажи још"</string>
<string name="see_less" msgid="2642392725363552793">"Прикажи мање"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Желите ли да укључите услугу <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Желите ли да укључите SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Желите ли да пређете на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Желите ли да пређете на SIM картицу?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"У датом тренутку може да буде активна само једна SIM картица.\n\nПребацивањем на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> нећете отказати услугу <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"У датом тренутку може да буде активна само једна преузета SIM картица.\n\nПребацивањем на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> нећете отказати услугу <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"У датом тренутку може да буде активна само једна SIM картица.\n\nПребацивањем нећете отказати услугу <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Пређи на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Повезује се са мрежом…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Прелази се на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Промена мобилног оператера није успела"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Промена мобилног оператера није успела због грешке."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Желите ли да искључите услугу <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Желите ли да искључите SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM се искључује<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Онемогућавање мобилног оператера није успело"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Онемогућавање мобилног оператера није успело"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Дошло је до грешке и онемогућавање мобилног оператера није успело."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Желите ли да користите 2 SIM картице?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На овом уређају 2 SIM картице могу да буду активне истовремено. Да бисте наставили да користите само 1 SIM картицу, додирните „Не, хвала“."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Желите ли да рестартујете уређај?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Да бисте започели, рестартујте уређај. Затим можете да додате још једну SIM картицу."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Настави"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартуј"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, хвала"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Пређи"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Активирање SIM картице није успело"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Уклоните SIM картицу, па је уметните поново. Ако се проблем и даље јавља, рестартујте уређај."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Пробајте поново да укључите SIM картицу. Ако се проблем и даље јавља, рестартујте уређај."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Желите ли да обришете овај преузети SIM?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Брисањем ове SIM картице уклонићете <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> услугу са овог уређаја.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> услуга неће бити отказана."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Обриши"</string>
@@ -5071,4 +5096,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ће се укључити"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Укључено"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Искључено"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM картице"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Мреже које су безбедне по авион"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Пронађите мреже које су безбедне по авион и повежите се на њих"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно по авион"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Позиви и SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Позивање преко WiFi-ја"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Упућујте и примајте позиве преко мрежа које не припадају мобилном оператеру, на пример, WiFi-ја"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Позивање преко WiFi-ја вам омогућава да примате и упућујете позиве преко мрежа које не припадају мобилном оператеру, на пример, неких WiFi мрежа.\n\nПозиви преко више SIM картица омогућавају вам да искористите мобилне податке SIM картице да бисте са друге SIM картице упућивали или примали позиве."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Позиви"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a765a7e..e394af1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangordna automatiskt aviseringar efter relevans"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om anpassad avisering"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Ange justeringar av aviseringar och visa möjligheten att ge feedback till systemet"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Återställ aviseringarnas relevans"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Återställ relevansinställningarna som användaren har ändrat och tillåt att aviseringsassistenten prioriterar"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Föreslagna åtgärder och svar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Visa föreslagna åtgärder och svar automatiskt"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Visa de senaste aviseringarna och uppskjutna aviseringar"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Inte tillgänglig vid anslutning till <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Visa mer"</string>
<string name="see_less" msgid="2642392725363552793">"Visa färre"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vill du aktivera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vill du aktivera SIM-kortet?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vill du byta till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vill du byta till SIM-kort?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nOm du byter till <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte tjänsten hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nOm du byter till <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte tjänsten hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nTjänsten hos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte för att du byter SIM-kort."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Byt till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ansluter till nätverket …"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Byter till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Det gick inte att byta operatör"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Det gick inte att byta operatör på grund av ett fel."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vill du inaktivera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vill du inaktivera SIM-kortet?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kortet inaktiveras <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Det gick inte att inaktivera operatören"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Det gick inte att inaktivera operatören"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Något gick fel och operatören gick inte att inaktivera."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vill du använda två SIM-kort?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Du kan ha två SIM-kort aktiverade samtidigt på enheten. Om du vill fortsätta att använda ett SIM-kort åt gången trycker du på Nej tack."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Vill du starta om enheten?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Starta först om enheten. Sedan kan du lägga till ett SIM-kort."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Fortsätt"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Starta om"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tack"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Byt"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Det gick inte att aktivera SIM-kortet"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ta ut SIM-kortet och sätt i det igen. Starta om enheten om problemet kvarstår."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Testa att aktivera SIM-kortet igen. Starta om enheten om problemet kvarstår."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Vill du rensa det här nedladdade SIM-kortet?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Om du rensar det här SIM-kortet tas tjänsten hos <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> bort från enheten.\n\nTjänsten hos <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> avslutas inte."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Rensa"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveras"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"På"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Nätverk som är flygplanssäkra"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Hitta och ansluta till nätverk som är flygplanssäkra"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flygplan, flygplanssäker"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Samtal och sms"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-samtal"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Ringa och ta emot samtal via nätverk som inte tillhör operatörer, som Wi‑Fi-nätverk"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Med Wi-Fi-samtal kan du ringa och ta emot samtal via nätverk som inte tillhör operatörer, som vissa Wi‑Fi-nätverk.\n\nMed samtal mellan SIM-kort går det att använda mobildata från ett SIM-kort för att ringa och ta emot samtal från ett annat SIM-kort."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Samtal"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5e59056..d17da72 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2813,7 +2813,7 @@
<string name="really_remove_account_title" msgid="253097435885652310">"Je, ungependa kuondoa akaunti?"</string>
<string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye kompyuta kibao!"</string>
<string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye simu!"</string>
- <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Kuondoa akaunti hii kutasabibisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
+ <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Kuondoa akaunti hii kutasababisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
<string name="remove_account_failed" msgid="3709502163548900644">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
<string name="cant_sync_dialog_title" msgid="2613000568881139517">"Huwezi kusawazisha mwenyewe"</string>
<string name="cant_sync_dialog_message" msgid="7612557105054568581">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
@@ -3051,7 +3051,7 @@
<string name="user_lockscreen_settings" msgid="4596612658981942092">"Mipangilio ya kufunga skrini"</string>
<string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ongeza watumiaji skrini ikiwa imefungwa"</string>
<string name="user_confirm_remove_self_title" msgid="926265330805361832">"Ungependa kujifuta?"</string>
- <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ungependa kumtafuta mtumiaji huyu?"</string>
+ <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ungependa kumfuta mtumiaji huyu?"</string>
<string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ungependa kuondoa wasifu?"</string>
<string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Ungependa kuondoa wasifu wa kazini?"</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Panga arifa kiotomatiki kulingana na uhusiano"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maoni kuhusu arifa zinazojirekebisha"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Onyesha marekebisho yaliyofanywa kwenye arifa na uonyeshe chaguo la kutoa maoni kwenye mfumo"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Badilisha umuhimu wa arifa"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Badilisha mipangilio ya umuhimu iliyobadilishwa na mtumiaji na uruhusu mratibu wa arifa kuweka vipaumbele"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Vitendo na majibu yanayopendekezwa"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Onyesha kiotomatiki vitendo na majibu yanayopendekezwa"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Onyesha arifa za hivi majuzi na zile ulizoahirisha"</string>
@@ -3577,7 +3579,7 @@
<string name="other_conversations" msgid="551178916855139870">"Mazungumzo yasiyopewa kipaumbele"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"Mazungumzo uliyofanyia mabadiliko"</string>
<string name="recent_conversations" msgid="471678228756995274">"Mazungumzo ya hivi majuzi"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Futa za hivi majuzi"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Futa ya hivi majuzi"</string>
<string name="clear" msgid="5092178335409471100">"Futa"</string>
<string name="important_bubble" msgid="7911698275408390846">"Yafanye mazungumzo ya kipaumbele yatoe viputo"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Mazungumzo ya kipaumbele huonekana juu ya menyu inayovutwa chini. Unaweza pia kuyafanya yatoe viputo na kukatiza kipengele cha Usinisumbue."</string>
@@ -4846,11 +4848,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Angalia zaidi"</string>
<string name="see_less" msgid="2642392725363552793">"Angalia chache"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ungependa kuwasha <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ungependa kuwasha SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Ungependa kubadili utumie <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Ungependa kubadili ili utumie SIM kadi?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Unaweza kutumia SIM moja tu kwa wakati mmoja.\n\nKubadili na kutumia <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hakutaghairi huduma yako ya <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Unaweza kutumia SIM moja tu iliyopakuliwa kwa wakati mmoja.\n\nKubadili na kutumia <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hakutaghairi huduma yako ya <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Unaweza kutumia SIM moja tu kwa wakati mmoja.\n\nKubadili SIM hakutaghairi huduma yako ya <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Badili utumie <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Inaunganisha kwenye mtandao…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Inabadili ili kutumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Imeshindwa kubadilisha mtandao wa mtoa huduma"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Imeshindwa kubadilisha mtandao wa mtoa huduma kutokana na hitilafu."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Ungependa kuzima <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Ungependa kuzima SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Inazima SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Imeshindwa kuzima mtandao wa mtoa huduma"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Imeshindwa kuzima mtandao wa mtoa huduma"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hitilafu imetokea na mtandao wa mtoa huduma wako haukuweza kuzimwa."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Ungependa kutumia SIM 2?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kifaa hiki kinaweza kutumia SIM 2 kwa wakati mmoja. Ili uendelee kutumia SIM 1 kwa wakati, gusa \"Hapana\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Ungependa kuzima kisha uwashe kifaa?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Ili uanze, zima kisha uwashe kifaa chako. Kisha unaweza kuongeza SIM nyingine."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Endelea"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Zima kisha uwashe"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Hapana"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Badilisha"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Imeshindwa kuanza kutumia SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ondoa SIM na uiweke tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Jaribu kuwasha SIM tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Je, ungependa kufuta data yote kwenye SIM hii iliyopakuliwa?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Kufuta data yote kwenye SIM hii huondoa huduma ya <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> kwenye kifaa hiki.\n\nHuduma ya <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> haitaghairiwa."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Futa data yote"</string>
@@ -4989,4 +5014,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth itawaka"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Kimewashwa"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Kimezimwa"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Intaneti"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mitandao salama ya ndegeni"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Tafuta na uunganishe kwenye mitandao salama ya ndegeni"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ndegeni, salama ya ndegeni"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Simu na SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Kupiga simu kupitia Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Piga na upokee simu kwa kutumia mitandao isiyo ya mtoa huduma kama vile Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Kipengele cha Kupiga simu kupitia Wi-Fi kinakuruhusu upige na kupokea simu kupitia mitandao isiyo ya watoa huduma kama vile baadhi ya mitandao ya Wi-Fi.\n\nKipengele cha kupiga simu kupitia SIM tofauti kinakuruhusu utumie data ya mtandao wa simu kwenye SIM ili kupiga na kupokea simu kutoka SIM nyingine."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Simu"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 843de35..f7fc048 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"தொடர்பின் அடிப்படையில் அறிவிப்புக்களைத் தானாக வரிசைப்படுத்தும்"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"சூழலுக்கேற்ற அறிவிப்புக்கான கருத்து"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"அறிவிப்புகளில் செய்யப்பட்ட மாற்றங்களைக் குறிக்கும் மற்றும் சிஸ்டத்திற்குக் கருத்தை வழங்குவதற்கான விருப்பத்தைக் காட்டும்"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"அறிவிப்பு முக்கியத்துவத்தை மீட்டமைத்தல்"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"பயனரால் மாற்றப்பட்ட முக்கிய அமைப்புகளை மீட்டமைத்து முன்னுரிமை அளிக்க அறிவிப்பு உதவிக்கு அனுமதி வழங்கவும்"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"பரிந்துரைக்கப்படும் செயல்களும் பதில்களும்"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"பரிந்துரைக்கப்படும் செயல்கள் & பதில்களைத் தானாகவே காட்டு"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"சமீபத்திய மற்றும் ஒத்திவைத்த அறிவிப்புகளைக் காட்டும்"</string>
@@ -4531,7 +4533,7 @@
<string name="auto_sync_account_summary" msgid="7580352130028957346">"ஆப்ஸ் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதி"</string>
<string name="account_sync_title" msgid="7036067017433297574">"கணக்கு ஒத்திசைவு"</string>
<string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> இல் <xliff:g id="ID_1">%1$d</xliff:g>க்கு ஒத்திசைவு இயக்கத்தில் உள்ளது"</string>
- <string name="account_sync_summary_all_on" msgid="2953682111836599841">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கு"</string>
+ <string name="account_sync_summary_all_on" msgid="2953682111836599841">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கும்"</string>
<string name="account_sync_summary_all_off" msgid="6378301874540507884">"எல்லாவற்றுக்கும் ஒத்திசைவை முடக்கு"</string>
<string name="enterprise_privacy_settings" msgid="786350385374794180">"நிர்வகிக்கப்படும் சாதனத் தகவல்"</string>
<string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"உங்கள் நிறுவனம் நிர்வகிக்கும் மாற்றங்களும் அமைப்புகளும்"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
<string name="see_more" msgid="7499355691042812723">"மேலும் காட்டு"</string>
<string name="see_less" msgid="2642392725363552793">"குறைவாகக் காட்டு"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆன் செய்யவா?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"சிம்மை ஆன் செய்யவா?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றவா?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"சிம் கார்டைப் பயன்படுத்தவா?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ஒரு நேரத்தில் ஒரு பதிவிறக்கிய சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\nமாற்றுவதனால் <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்று"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"நெட்வொர்க்குடன் இணைக்கிறது…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றுகிறது"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"மொபைல் நிறுவனத்தை மாற்ற முடியவில்லை"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"பிழை காரணமாக மொபைல் நிறுவனத்தை மாற்ற முடியவில்லை."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆஃப் செய்யவா?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"சிம்மை ஆஃப் செய்யவா?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"சிம்மை ஆஃப் செய்கிறது<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"தொலைத்தொடர்பு நிறுவனத்தை முடக்க முடியவில்லை"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"மொபைல் நிறுவனத்தை முடக்க முடியவில்லை"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ஏதோ தவறாகிவிட்டதால் தொலைத்தொடர்பு நிறுவனத்தை முடக்க முடியவில்லை."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 சிம்களைப் பயன்படுத்தவா?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"இந்த மொபைலில் ஒரே சமயத்தில் 2 சிம்களைப் பயன்படுத்தலாம். ஒரு சமயத்தில் 1 சிம்மை மட்டும் பயன்படுத்த, \"வேண்டாம்\" என்பதைத் தட்டவும்."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"சாதனத்தை மீண்டும் தொடங்கவா?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"இயக்குவதற்கு மொபைலை மீண்டும் தொடங்கவும். பிறகு மற்றொரு சிம்மை நீங்கள் சேர்க்கலாம்."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"தொடர்க"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"மீண்டும் தொடங்கு"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"வேண்டாம்"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"மாற்று"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"சிம்மை இயக்க முடியவில்லை"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"சிம்மை அகற்றிவிட்டு மீண்டும் செருகவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"சிம்மை மீண்டும் ஆன் செய்து பார்க்கவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"இந்தப் பதிவிறக்கிய சிம்மை அழிக்கவா?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"சிம்மை அழிப்பது இந்தச் சாதனத்தில் இருந்து <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> சேவையை அகற்றிவிடும்.\n\nஇதனால் <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"அழி"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"புளூடூத் ஆன் செய்யப்படும்"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ஆன்"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ஆஃப்"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"இணையம்"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"சிம்கள்"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"விமானப்-பாதுகாப்பு நெட்வொர்க்குகள்"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"விமானப்-பாதுகாப்பு நெட்வொர்க்குகளைத் தேடி இணைக்கவும்"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"விமானம், விமானப்-பாதுகாப்பு"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"அழைப்புகள் & மெசேஜ்"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"வைஃபை அழைப்பு"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"வைஃபை போன்ற மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கலாம், அழைப்புகளைப் பெறலாம்"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"சில வைஃபை நெட்வொர்க்குகள் போன்று மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கவும் அழைப்புகளைப் பெறவும் வைஃபை அழைப்பு அனுமதிக்கும்.\n\nஒரு சிம்மின் மொபைல் டேட்டாவைப் பயன்படுத்தி மற்றொரு சிம்மிலிருந்து அழைக்கவும் அழைப்புகளைப் பெறவும் கிராஸ்-சிம் அழைப்பு அனுமதிக்கும்."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"அழைப்புகள்"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"மெசேஜ்"</string>
</resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 93ffc1f..0e509cc 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -123,7 +123,7 @@
<item msgid="4241913314075719627">"ఎప్పటికీ గడువు ముగియదు"</item>
</string-array>
<string-array name="bluetooth_max_connected_audio_devices">
- <item msgid="4792793579224104167">"సిస్టమ్ డిఫాల్ట్ని ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+ <item msgid="4792793579224104167">"సిస్టమ్ ఆటోమేటిక్ విలువను ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
<item msgid="5818942631838356082">"1"</item>
<item msgid="4804155564025402919">"2"</item>
<item msgid="7123296338505723878">"3"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index aec625d..aea7b51c 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1119,17 +1119,17 @@
<string name="wifi_disconnected_from" msgid="5249576734324159708">"<xliff:g id="SSID">%1$s</xliff:g> నుండి డిస్కనెక్ట్ చేయబడింది"</string>
<string name="carrier" msgid="1755020806290963951">"క్యారియర్"</string>
<string name="display_settings_title" msgid="626835071804834218">"డిస్ప్లే"</string>
- <string name="sound_settings" msgid="5514582720435174014">"ధ్వని"</string>
+ <string name="sound_settings" msgid="5514582720435174014">"సౌండ్"</string>
<string name="all_volume_title" msgid="6196367642878437513">"వాల్యూమ్లు"</string>
<string name="musicfx_title" msgid="5458574743312283473">"సంగీత ప్రభావాలు"</string>
<string name="ring_volume_title" msgid="4869034595079914541">"రింగ్ & నోటిఫికేషన్ వాల్యూమ్"</string>
<string name="vibrate_in_silent_title" msgid="5076579100685867363">"నిశ్శబ్దంగా ఉన్నప్పుడు వైబ్రేట్ చేయి"</string>
- <string name="notification_sound_title" msgid="8747567935870133157">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+ <string name="notification_sound_title" msgid="8747567935870133157">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
<string name="incoming_call_volume_title" msgid="8445408274513654261">"రింగ్టోన్"</string>
<string name="notification_volume_title" msgid="328053763590888609">"నోటిఫికేషన్"</string>
<string name="checkbox_notification_same_as_incoming_call" msgid="1798481722572489141">"నోటిఫికేషన్ల కోసం ఇన్కమింగ్ కాల్ వాల్యూమ్ను ఉపయోగించు"</string>
<string name="home_work_profile_not_supported" msgid="2605589489324241338">"కార్యాలయ ప్రొఫైల్లకు మద్దతు ఇవ్వదు"</string>
- <string name="notification_sound_dialog_title" msgid="7431891669251806266">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+ <string name="notification_sound_dialog_title" msgid="7431891669251806266">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
<string name="media_volume_title" msgid="5209147840160985178">"మీడియా"</string>
<string name="media_volume_summary" msgid="4671324482655564873">"సంగీతం మరియు వీడియోల కోసం వాల్యూమ్ను సెట్ చేయి"</string>
<string name="alarm_volume_title" msgid="706302621191735343">"అలారం"</string>
@@ -1232,7 +1232,7 @@
<string name="night_display_summary_off" msgid="4676320734342206009">"ఆఫ్లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ఎప్పటికీ ఆటోమేటిక్గా ఆన్ కాదు"</string>
<string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
- <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"సూర్యాస్తమయ సమయానికి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
+ <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"సూర్యాస్తమయ సమయానికి ఆటోమేటిక్గా ఆన్ అవుతుంది"</string>
<string name="night_display_summary_on" msgid="8932395375143965229">"ఆన్లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు"</string>
<string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>కి ఆటోమేటిక్గా ఆఫ్ అవుతుంది"</string>
@@ -1837,7 +1837,7 @@
<string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"అన్లాక్ నమూనాను మార్చు"</string>
<string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"అన్లాక్ పిన్ను మార్చండి"</string>
<string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"అన్లాక్ ఆకృతిని గీయండి"</string>
- <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెను నొక్కండి."</string>
+ <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెనూ నొక్కండి."</string>
<string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"పూర్తయినప్పుడు వేలును తీసివేయండి"</string>
<string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"కనీసం <xliff:g id="NUMBER">%d</xliff:g> చుక్కలను కలపండి. మళ్లీ ప్రయత్నించండి."</string>
<string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"ఆకృతి రికార్డ్ చేయబడింది"</string>
@@ -2133,7 +2133,7 @@
<string name="vision_settings_description" msgid="7614894785054441991">"మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ ఫీచర్లను సెట్టింగ్లలో తర్వాత మార్చవచ్చు."</string>
<string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ఫాంట్ పరిమాణాన్ని మార్చండి"</string>
<string name="screen_reader_category_title" msgid="6195867428854871553">"స్క్రీన్ రీడర్లు"</string>
- <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో & స్క్రీన్పై ఉన్న వచనం"</string>
+ <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో & స్క్రీన్పై ఉండే టెక్స్ట్"</string>
<string name="display_category_title" msgid="6638191682294461408">"డిస్ప్లే"</string>
<string name="interaction_control_category_title" msgid="2696474616743882372">"పరస్పర చర్య నియంత్రణలు"</string>
<string name="user_installed_services_category_title" msgid="2639470729311439731">"డౌన్లోడ్ చేసిన యాప్లు"</string>
@@ -2202,7 +2202,7 @@
<string name="accessibility_shortcut_settings" msgid="836783442658447995">"షార్ట్కట్ సెట్టింగ్లు"</string>
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"లాక్ స్క్రీన్లో షార్ట్కట్"</string>
<string name="accessibility_shortcut_description" msgid="2184693606202133549">"లాక్ స్క్రీన్లో \'షార్ట్కట్\' ఫీచర్ ఆన్ చేయడానికి అనుమతించండి. వాల్యూమ్ కీలు రెండింటినీ కొన్ని సెకన్ల పాటు నొక్కి పట్టుకోండి."</string>
- <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"అధిక కాంట్రాస్ట్ వచనం"</string>
+ <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"అధిక కాంట్రాస్ట్ టెక్స్ట్"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
<string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"పవర్ బటన్ కాల్ను ముగిస్తుంది"</string>
@@ -3330,10 +3330,10 @@
<string name="ring_volume_option_title" msgid="1520802026403038560">"రింగ్ & నోటిఫికేషన్ వాల్యూమ్"</string>
<string name="notification_volume_option_title" msgid="4838818791683615978">"నోటిఫికేషన్ వాల్యూమ్"</string>
<string name="ringtone_title" msgid="3271453110387368088">"ఫోన్ రింగ్టోన్"</string>
- <string name="notification_ringtone_title" msgid="6924501621312095512">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+ <string name="notification_ringtone_title" msgid="6924501621312095512">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
<string name="notification_unknown_sound_title" msgid="1319708450698738980">"యాప్ అందించిన ధ్వని"</string>
- <string name="notification_sound_default" msgid="8630353701915294299">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
- <string name="alarm_ringtone_title" msgid="6680761007731764726">"డిఫాల్ట్ అలారం ధ్వని"</string>
+ <string name="notification_sound_default" msgid="8630353701915294299">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
+ <string name="alarm_ringtone_title" msgid="6680761007731764726">"అలారం ఆటోమేటిక్ సౌండ్"</string>
<string name="vibrate_when_ringing_title" msgid="3436203665622843196">"కాల్స్ వచ్చినప్పుడు వైబ్రేట్ అవ్వు"</string>
<string name="keywords_vibrate_for_calls" msgid="1019870409730074899">"వైబ్రేషన్"</string>
<string name="vibrate_when_ringing_option_never_vibrate" msgid="6518980907289156517">"ఎప్పుడూ వైబ్రేట్ చేయవద్దు"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ఇది నోటిఫికేషన్లను ఔచిత్యాన్ని బట్టి ఆటోమేటిక్గా ర్యాంక్ చేస్తుంది"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"అనుకూల నోటిఫికేషన్ ఫీడ్బ్యాక్"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"నోటిఫికేషన్లకు చేసిన సర్దుబాట్లను సూచిస్తుంది, అలాగే సిస్టమ్కు ఫీడ్బ్యాక్ను అందించే ఆప్షన్ను చూపుతుంది"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"నోటిఫికేషన్ ప్రాముఖ్యతను రీసెట్ చేయండి"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"యూజర్ మార్చిన ప్రాముఖ్యత సెట్టింగ్లను రీసెట్ చేయండి, నోటిఫికేషన్ అసిస్టెంట్ను ప్రాధాన్యత ఇవ్వడానికి అనుమతించండి"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"సూచించబడిన చర్యలు, రిప్లయిలు"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"సూచనాత్మక చర్యలను & రిప్లయిలను ఆటోమేటిక్గా చూపుతుంది"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"ఇటీవలి మరియు స్నూజ్ చేయబడిన నోటిఫికేషన్లను చూపించు"</string>
@@ -3716,7 +3718,7 @@
<string name="app_notification_importance_title" msgid="8293193440040799998">"ప్రాముఖ్యత"</string>
<string name="notification_show_lights_title" msgid="5564315979007438583">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
<string name="notification_vibrate_title" msgid="1422330728336623351">"వైబ్రేషన్"</string>
- <string name="notification_channel_sound_title" msgid="9018031231387273476">"ధ్వని"</string>
+ <string name="notification_channel_sound_title" msgid="9018031231387273476">"సౌండ్"</string>
<string name="notification_conversation_important" msgid="4365437037763608045">"ప్రాధాన్యత"</string>
<string name="notification_conversation_add_to_home" msgid="8136269431130231389">"హోమ్కు జోడించండి"</string>
<string name="zen_mode_rule_delete_button" msgid="7642063606919058862">"తొలగించు"</string>
@@ -4073,7 +4075,7 @@
<string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
<string name="usb_use_MIDI_desc" msgid="6464135515868405143">"ఈ పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
<string name="usb_use" msgid="6783183432648438528">"దీని కోసం USBని ఉపయోగించండి"</string>
- <string name="usb_default_label" msgid="3372838450371060750">"డిఫాల్ట్ USB కాన్ఫిగరేషన్"</string>
+ <string name="usb_default_label" msgid="3372838450371060750">"USB ఆటోమేటిక్ కాన్ఫిగరేషన్"</string>
<string name="usb_default_info" msgid="167172599497085266">"మరొక పరికరం కనెక్ట్ అయ్యి ఉన్నప్పుడు మరియు మీ ఫోన్ అన్లాక్ చేయబడి ఉన్నప్పుడు, ఈ సెట్టింగ్లు వర్తింపజేయబడతాయి. కేవలం విశ్వసనీయ పరికరాలకు మాత్రమే కనెక్ట్ చేయండి."</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ప్రాధాన్యతలు"</string>
@@ -4333,7 +4335,7 @@
<string name="data_saver_switch_title" msgid="7111538580123722959">"డేటా సేవర్ని ఉపయోగించు"</string>
<string name="unrestricted_app_title" msgid="7117585996574329284">"అనియంత్రిత డేటా వినియోగం"</string>
<string name="unrestricted_app_summary" msgid="282698963532000403">"డేటా సేవర్లో అనియంత్రిత డేటా"</string>
- <string name="home_app" msgid="6056850504746902747">"హోమ్ యాప్"</string>
+ <string name="home_app" msgid="6056850504746902747">"మొదటి స్క్రీన్ యాప్"</string>
<string name="no_default_home" msgid="3588073707316139318">"డిఫాల్ట్ హోమ్ లేదు"</string>
<string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"సురక్షిత ప్రారంభం"</string>
<string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"మీ డివైజ్ను ప్రారంభించడానికి ఆకృతి అవసరం. ఆఫ్లో ఉన్నప్పుడు, ఈ డివైజ్ కాల్లు, సందేశాలు, నోటిఫికేషన్లు లేదా అలారాలను స్వీకరించలేదు."</string>
@@ -4630,7 +4632,7 @@
<string name="autofill_max_visible_datasets" msgid="4970201981694392229">"కనిపించగల గరిష్ఠ డేటాసమితులు"</string>
<string name="autofill_reset_developer_options" msgid="6425613608979498608">"డిఫాల్ట్ విలువలకు రీసెట్ చేయి"</string>
<string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"స్వీయ పూరింపు డెవలపర్ ఎంపికలు రీసెట్ చేయబడ్డాయి"</string>
- <string name="device_theme" msgid="5027604586494772471">"పరికర థీమ్"</string>
+ <string name="device_theme" msgid="5027604586494772471">"పరికర రూపం"</string>
<string name="default_theme" msgid="4815428567082263639">"డిఫాల్ట్"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"నెట్వర్క్ పేరు"</string>
<string name="show_operator_name_summary" msgid="5352696579216501773">"స్థితి పట్టీలో నెట్వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
@@ -4847,11 +4849,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
<string name="see_more" msgid="7499355691042812723">"మరిన్నింటిని చూడండి"</string>
<string name="see_less" msgid="2642392725363552793">"తక్కువ చూడండి"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆన్ చేయాలా?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMను ఆన్ చేయాలా?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వాలా?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"సిమ్ కార్డ్ను ఉపయోగించడానికి స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ఒకసారి ఒక డౌన్లోడ్ చేయబడిన SIM మాత్రమే యాక్టివ్గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్గా ఉంటుంది.\n\nస్విచ్ అవ్వడం వలన మీ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వండి"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"నెట్వర్క్కు కనెక్ట్ చేస్తోంది…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవుతోంది"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"క్యారియర్ను స్విచ్ చేయడం సాధ్యం కాదు"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ఎర్రర్ కారణంగా క్యారియర్ను స్విచ్ చేయడం సాధ్యం కాదు."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆఫ్ చేయాలా?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"సిమ్ను ఆఫ్ చేయాలా?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"సిమ్ను ఆఫ్ చేస్తోంది<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"క్యారియర్ను డిజేబుల్ చేయడం సాధ్యం కాదు"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"క్యారియర్ను డిజేబుల్ చేయడం సాధ్యం కాదు"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ఏదో తప్పు జరిగింది, మీ క్యారియర్ను డిజేబుల్ చేయడం సాధ్యం కాలేదు."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIMలు ఉపయోగిస్తారా?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ఈ పరికరంలో ఒకే సమయంలో 2 SIMలు యాక్టివ్గా ఉండే సౌకర్యం ఉంది. ఒక సమయంలో ఒక్క SIMనే ఉపయోగించాలనుకుంటే, \"వద్దు, ధన్యవాదాలు\"ను ట్యాప్ చేయండి."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"పరికరాన్ని రీస్టార్ట్ చేయాలా?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"ఈ మోడ్ను ప్రారంభించడానికి, మీ పరికరాన్ని రీస్టార్ట్ చేయండి. ఆపై, మీరు మరొక SIMను జోడించవచ్చు."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"కొనసాగించు"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"రీస్టార్ట్ చేయి"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"వద్దు, ధన్యవాదాలు"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"స్విచ్ చేయి"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMను యాక్టివేట్ చేయడం సాధ్యం కాదు"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMను తిరిగి ఆన్ చేయడానికి ట్రై చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"డౌన్లోడ్ చేయబడిన ఈ SIMను తొలగించాలా?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"ఈ SIMను తొలగించడం వలన ఈ పరికరం నుండి <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> సర్వీస్ తీసివేయబడుతోంది.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"తొలగించు"</string>
@@ -4950,7 +4975,7 @@
<string name="cards_passes_sentence" msgid="1866311782387946944">"కార్డ్లు & పాస్లు"</string>
<string name="cards_passes_lower" msgid="2429722007109957877">"కార్డ్లు & పాస్లు"</string>
<string name="power_menu_setting_name" msgid="7843519296976254765">"పవర్ మెనూ"</string>
- <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెను"</string>
+ <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెనూ"</string>
<string name="power_menu_cards_passes" msgid="1707852019651773645">"కార్డ్లు & పాస్లు చూపించు"</string>
<string name="power_menu_device_controls" msgid="5114816270328063924">"పరికరం నియంత్రణలను చూపించు"</string>
<string name="power_menu_cards_passes_device_controls" msgid="8645794247280620106">"కార్డ్లు, పాస్లు, పరికరం నియంత్రణలను చూపించు"</string>
@@ -4990,4 +5015,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"బ్లూటూత్ ఆన్ చేయబడుతుంది"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"ఆన్"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ఆఫ్"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"ఇంటర్నెట్"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMలు"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"విమానం-సురక్షిత నెట్వర్క్లు"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"విమానం‑సురక్షిత నెట్వర్క్లను కనుగొని కనెక్ట్ చేయండి"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"విమానం, విమానం-సురక్షిత"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"కాల్స్ & SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi కాలింగ్"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi వంటి క్యారియర్ కాని నెట్వర్క్ల ద్వారా కాల్స్ చేయండి, స్వీకరించండి"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"కొన్ని Wi-Fi నెట్వర్క్ల వంటివి క్యారియర్ కాని నెట్వర్క్ల ద్వారా కాల్స్ చేయడానికి, స్వీకరించడానికి Wi-Fi కాలింగ్ మిమ్మల్ని అనుమతిస్తుంది.\n\nక్రాస్-SIM కాలింగ్ మరొక SIM నుండి కాల్స్ చేయడానికి, స్వీకరించడానికి SIM మొబైల్ డేటాను ప్రభావితం చేయడానికి మిమ్మల్ని అనుమతిస్తుంది."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"కాల్స్"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f073d38..a380d86 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2813,7 +2813,7 @@
<string name="really_remove_account_title" msgid="253097435885652310">"นำบัญชีออกหรือไม่"</string>
<string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากแท็บเล็ต"</string>
<string name="really_remove_account_message" product="default" msgid="1217810840427479274">"การนำบัญชีนี้ออกจะลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากโทรศัพท์"</string>
- <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!"</string>
+ <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์"</string>
<string name="remove_account_failed" msgid="3709502163548900644">"ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้"</string>
<string name="cant_sync_dialog_title" msgid="2613000568881139517">"ซิงค์ด้วยตนเองไม่ได้"</string>
<string name="cant_sync_dialog_message" msgid="7612557105054568581">"รายการนี้ปิดการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"จัดอันดับการแจ้งเตือนตามความเกี่ยวข้องโดยอัตโนมัติ"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ความคิดเห็นเกี่ยวกับการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ระบุการปรับเปลี่ยนที่เกิดขึ้นกับการแจ้งเตือนและแสดงตัวเลือกในการแสดงความคิดเห็นให้กับระบบ"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"รีเซ็ตความสำคัญในการแจ้งเตือน"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"รีเซ็ตการตั้งค่าความสำคัญที่ผู้ใช้เปลี่ยน และอนุญาตให้ผู้ช่วยการแจ้งเตือนจัดลำดับความสำคัญ"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"การดำเนินการและการตอบที่แนะนำ"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"แสดงการดำเนินการและการตอบที่แนะนำโดยอัตโนมัติ"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"แสดงการแจ้งเตือนล่าสุดและการแจ้งเตือนที่มีการเลื่อนเวลา"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ใช้ไม่ได้เมื่อเชื่อมต่อกับ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"ดูเพิ่ม"</string>
<string name="see_less" msgid="2642392725363552793">"ดูน้อยลง"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ต้องการเปิด <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ต้องการเปิดซิมใช่ไหม"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"เปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"เปลี่ยนไปใช้ซิมการ์ดใช่ไหม"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ใช้งานซิมได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนเป็น <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> จะไม่ยกเลิกบริการของ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ใช้งานซิมที่ดาวน์โหลดมาได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนเป็น <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> จะไม่ยกเลิกบริการของ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ใช้งานซิมได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนจะไม่ยกเลิกบริการของ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"เปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"กำลังเชื่อมต่อกับเครือข่าย…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"กำลังเปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"เปลี่ยนผู้ให้บริการไม่ได้"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"เปลี่ยนผู้ให้บริการไม่ได้เนื่องจากมีข้อผิดพลาด"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ต้องการปิด <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ปิดซิมใช่ไหม"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"กำลังปิดซิม<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ปิดใช้ผู้ให้บริการไม่ได้"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ปิดใช้ผู้ให้บริการไม่ได้"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"เกิดข้อผิดพลาดที่ทำให้ปิดใช้ผู้ให้บริการไม่ได้"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ใช้ 2 ซิมไหม"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"อุปกรณ์นี้ใช้ 2 ซิมพร้อมกันได้ หากต้องการใช้ครั้งละ 1 ซิมต่อไป ให้แตะ \"ไม่เป็นไร\""</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"รีสตาร์ทอุปกรณ์ไหม"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"รีสตาร์ทอุปกรณ์เพื่อเริ่มต้นใช้งาน จากนั้นคุณจะเพิ่มซิมได้"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"ดำเนินการต่อ"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"รีสตาร์ท"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"ไม่เป็นไร"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"เปลี่ยน"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"เปิดใช้งานซิมไม่ได้"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ถอดซิมออกแล้วใส่กลับเข้าไปอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ลองเปิดใช้ซิมอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ลบซิมที่ดาวน์โหลดมานี้ใช่ไหม"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"การลบซิมนี้จะนำบริการ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ออกจากอุปกรณ์นี้\n\nแต่จะไม่ยกเลิกบริการของ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"ลบ"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"บลูทูธจะเปิด"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"เปิด"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"ปิด"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"อินเทอร์เน็ต"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"ซิม"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"เครือข่ายที่ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ค้นหาและเชื่อมต่อเครือข่ายที่ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"เครื่องบิน, ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"การโทรและ SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"การโทรผ่าน Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"โทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"การโทรผ่าน Wi-Fi ให้คุณโทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น เครือข่าย Wi-Fi บางเครือข่ายได้\n\nการโทรข้ามซิมให้คุณใช้ประโยชน์จากอินเทอร์เน็ตมือถือของซิมหนึ่งเพื่อโทรออกและรับสายจากอีกซิมหนึ่งได้"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"การโทร"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f05430e..57a413b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2447,9 +2447,9 @@
<string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Patagalin ang baterya ng iyong tablet"</string>
<string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Patagalin ang baterya ng iyong device"</string>
<string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"I-on ang Battery Manager"</string>
- <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"I-on ang Pangtipid sa Baterya"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"I-on ang Pantipid ng Baterya"</string>
<string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Baka mas maagang maubos ang baterya kaysa sa karaniwan"</string>
- <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Naka-on ang Pangtipid sa Baterya"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Naka-on ang Pantipid ng Baterya"</string>
<string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Maaaring limitado ang ilang feature"</string>
<string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Nagamit ang telepono nang higit sa karaniwan"</string>
<string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Nagamit ang tablet nang higit sa karaniwan"</string>
@@ -2487,9 +2487,9 @@
<string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Makakagamit ang app na ito ng baterya sa background. Maaaring maubos ang iyong baterya nang mas maaga kaysa sa inaasahan."</string>
<string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Alisin"</string>
<string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Kanselahin"</string>
- <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
- <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
- <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
+ <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+ <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+ <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
<string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
<string name="smart_battery_title" msgid="9095903608520254254">"Awtomatikong pamahalaan ang mga app"</string>
<string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Limitahan ang baterya para sa mga app na hindi mo madalas gamitin"</string>
@@ -2615,12 +2615,12 @@
<string name="menu_stats_refresh" msgid="6727628139586938835">"I-refresh"</string>
<string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="1190208677726583153">"Pag-optimize ng app"</string>
- <string name="battery_saver" msgid="7737147344510595864">"Pangtipid sa Baterya"</string>
+ <string name="battery_saver" msgid="7737147344510595864">"Pantipid ng Baterya"</string>
<string name="battery_saver_auto_title" msgid="6789753787070176144">"Awtomatikong i-on"</string>
<string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Walang iskedyul"</string>
<string name="battery_saver_auto_routine" msgid="4656495097900848608">"Batay sa iyong routine"</string>
<string name="battery_saver_auto_percentage" msgid="558533724806281980">"Batay sa porsyento"</string>
- <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Mag-o-on ang Pangtipid sa Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
+ <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Mag-o-on ang Pantipid ng Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
<string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Mag-o-on sa <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Magtakda ng iskedyul"</string>
<string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Patagalin ang baterya"</string>
@@ -2631,7 +2631,7 @@
<!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
<skip />
<string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"I-on"</string>
- <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Gumamit ng Pangtipid sa Baterya"</string>
+ <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Gumamit ng Pantipid ng Baterya"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Awtomatikong i-on"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Hindi Kailanman"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"sa <xliff:g id="PERCENT">%1$s</xliff:g> baterya"</string>
@@ -3312,8 +3312,8 @@
<string name="keywords_touch_vibration" msgid="1125291201902251273">"haptics, mag-vibrate, screen, pagkasensitibo"</string>
<string name="keywords_ring_vibration" msgid="1736301626537417541">"haptics, pag-vibrate, telepono, tawag, pagkasensitibo, pag-ring"</string>
<string name="keywords_notification_vibration" msgid="9162262178415439951">"haptics, pag-vibrate, pagkasensitibo"</string>
- <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"pangtipid sa baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
- <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pangtipid sa baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
+ <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"pantipid ng baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
+ <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pantipid ng baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
<string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, advanced na pagtawag, pagtawag gamit ang 4g"</string>
<string name="keywords_add_language" msgid="1882751300359939436">"idagdag ang wika, magdagdag ng wika"</string>
<string name="keywords_font_size" msgid="336803136451166298">"laki ng text"</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Awtomatikong i-rank ang mga notification ayon sa kaugnayan nito"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sa adaptive na notification"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Isaad ang mga pagsasaayos na ginawa sa mga notification at ipakita ang opsyon para makapagbigay ng feedback sa system"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"I-reset ang kahalagahan ng notification"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"I-reset ang mga setting sa kahalagahan na binago ng user at payagang magbigay ng priyoridad ang assistant ng notification"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Mga iminumungkahing pagkilos at tugon"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Awtomatikong ipakita ang mga iminumungkahing pagkilos at tugon"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Ipakita ang mga kamakailan at na-snooze na notification"</string>
@@ -4229,7 +4231,7 @@
<string name="condition_zen_title" msgid="7674761111934567490">"Naka-on ang Huwag Istorbohin"</string>
<string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Naka-mute ang telepono"</string>
<string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"May mga pagbubukod"</string>
- <string name="condition_battery_title" msgid="6395113995454385248">"Naka-on ang Pangtipid sa Baterya"</string>
+ <string name="condition_battery_title" msgid="6395113995454385248">"Naka-on ang Pantipid ng Baterya"</string>
<string name="condition_battery_summary" msgid="8436806157833107886">"Limitado ang mga feature"</string>
<string name="condition_cellular_title" msgid="155474690792125747">"Naka-off ang mobile data"</string>
<string name="condition_cellular_summary" msgid="1678098728303268851">"Available lang ang Internet sa pamamagitan ng Wi‑Fi"</string>
@@ -4406,8 +4408,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Nakakonekta sa maraming device"</string>
<string name="demo_mode" msgid="6566167465451386728">"Demo mode ng System UI"</string>
<string name="dark_ui_mode" msgid="898146394425795281">"Madilim na tema"</string>
- <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On / Pansamantalang na-disable dahil sa Pangtipid sa Baterya"</string>
- <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pansamantalang na-on dahil sa Pangtipid sa Baterya"</string>
+ <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On / Pansamantalang na-disable dahil sa Pantipid ng Baterya"</string>
+ <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pansamantalang na-on dahil sa Pantipid ng Baterya"</string>
<string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Lilipat din sa madilim na tema ang mga sinusuportahang app"</string>
<string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
<string name="dark_theme_slice_title" msgid="4684222119481114062">"Subukan ang Madilim na tema"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Hindi available kapag nakakonekta sa <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Tumingin pa"</string>
<string name="see_less" msgid="2642392725363552793">"Tumingin nang kaunti"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"I-on ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"I-on ang SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Lumipat sa paggamit ng SIM card?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Isang SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> kung lilipat ka sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Isang na-download na SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> kung lilipat ka sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Isang SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> kung lilipat ka."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Kumokonekta sa network…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Lumilipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Hindi makalipat ng carrier"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Hindi makalipat ng carrier dahil nagkaroon ng error."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"I-off ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"I-off ang SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ino-off ang SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Hindi ma-disable ang carrier"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Hindi ma-disable ang carrier"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nagkaproblema at hindi ma-disable ang iyong carrier."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gumamit ng 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Puwedeng magkaroon ang device na ito ng 2 aktibong SIM nang sabay. Para patuloy na gumamit ng 1 SIM sa isang pagkakataon, i-tap ang \"Hindi, salamat na lang.\""</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"I-restart ang device?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Para magsimula, i-restart ang iyong device. Pagkatapos, puwede kang magdagdag ng isa pang SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Magpatuloy"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"I-restart"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Huwag na lang"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Lumipat"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Hindi ma-activate ang SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Alisin ang SIM at ilagay ito ulit. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Subukang i-on ulit ang SIM. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Burahin ang na-download na SIM na ito?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Kapag binura ang SIM na ito, maaalis ang serbisyo ng <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sa device na ito.\n\nHindi makakansela ang serbisyo para sa <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Burahin"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Mag-o-on ang Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Naka-on"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Naka-off"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Mga SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mga network na ligtas gamitin sa eroplano"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Maghanap at kumonekta sa mga network na ligtas gamitin sa eroplano"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"eroplano, ligtas gamitin sa eroplano"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Mga Taawag at SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Pagtawag sa Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Gumawa at makatanggap ng mga tawag sa mga non-carrier network gaya ng Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Nagbibigay-daan sa iyo ang pagtawag sa Wi-Fi na gumawa at makatanggap ng mga tawag sa mga non-carrier network gaya ng ilang Wi‑Fi network.\n\nNagbibigay-daan sa iyo ang Cross-SIM na pagtawag na magamit ang mobile data ng isang sim para gumawa at makatanggap ng mga tawag mula sa isa pang SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Mga Tawag"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f793c98..903cb6e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirimleri alaka düzeyine göre otomatik olarak sırala"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Uyarlamalı bildirimlerle ilgili geri bildirim"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirimlerde yapılan düzenlemeleri belirtin ve sisteme geri bildirim sağlama seçeneğini gösterin"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildirimlerin önemini sıfırla"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Kullanıcı tarafından değiştirilen önem ayarlarını sıfırlar ve bildirim yardımcısının öncelik belirlemesine izin verir"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Önerilen işlemler ve yanıtlar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Önerilen işlemleri ve yanıtları otomatik olarak göster"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Son ve ertelenen bildirimleri göster"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> operatörüne bağlıyken kullanılamaz"</string>
<string name="see_more" msgid="7499355691042812723">"Daha fazla"</string>
<string name="see_less" msgid="2642392725363552793">"Daha az göster"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> etkinleştirilsin mi?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM açılsın mı?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geçilsin mi?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kart kullanmaya geçilsin mi?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aynı anda yalnızca indirilmiş tek bir SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aynı anda yalnızca bir indirilmiş SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Aynı anda yalnızca tek bir SIM etkin olabilir.\n\nGeçiş yaptığınızda <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hizmetiniz iptal edilmez."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geç"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ağa bağlanıyor…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geçiliyor"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operatöre geçiş yapılamıyor"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Bir hata nedeniyle operatöre geçiş yapılamıyor."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> kapatılsın mı?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM kapatılsın mı?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kapatılıyor<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatör devre dışı bırakılamıyor"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatör devre dışı bırakılamıyor"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Bir hata oluştu ve operatörünüz devre dışı bırakılamadı."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM kullanılsın mı?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu cihazda aynı anda 2 SIM etkin durumda olabilir. Tek seferde 1 SIM kullanmaya devam etmek için \"Hayır, teşekkürler\" seçeneğine dokunun."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Cihaz yeniden başlatılsın mı?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Öncelikle cihazınızı yeniden başlatın. Daha sonra başka bir SIM ekleyebilirsiniz."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Devam"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Yeniden başlat"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Hayır, teşekkürler"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Geçilsin"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM etkinleştirilemiyor"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM\'i çıkarıp tekrar yerleştirmeyi deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM\'i tekrar açmayı deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"İndirilen bu SIM silinsin mi?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM silindiğinde, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> hizmeti bu cihazdan kaldırılır.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> hizmeti iptal edilmez."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Sil"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth açılacak"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Aç"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Kapalı"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'ler"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Uçakta kullanımı güvenli ağlar"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Uçakta kullanımı güvenli ağları bulup bağlanın"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"uçak, uçakta kullanımı güvenli"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Aramalar ve SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Kablosuz Çağrı"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapın ve alın"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Kablosuz çağrı, bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapmanıza ve almanıza olanak tanır.\n\nSIM\'ler arası çağrı, bir SIM\'den arama yapmak ve almak için başka bir SIM\'in mobil verisinden yararlanmanıza olanak tanır."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Çağrılar"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 50cf751..0d32e6e 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -331,7 +331,7 @@
<item msgid="4722479281326245754">"Гучність голосу"</item>
<item msgid="6749550886745567276">"Гучність дзвінка"</item>
<item msgid="2218685029915863168">"Гучність медіа"</item>
- <item msgid="4266577290496513640">"Гучність будильник"</item>
+ <item msgid="4266577290496513640">"Гучність будильника"</item>
<item msgid="8608084169623998854">"Гучність сповіщення"</item>
<item msgid="7948784184567841794">"Гучність Bluetooth"</item>
<item msgid="1148968792599973150">"Залишати активним"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9344bcb..e4bd87d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1648,7 +1648,7 @@
<string name="restore_default_apn" msgid="6596048535642130689">"Відновлення налаштувань APN за умовчанням."</string>
<string name="menu_restore" msgid="4310539620115151551">"Скинути налаштування"</string>
<string name="restore_default_apn_completed" msgid="5167505087078340256">"Налаштування за умовчанням відновлено."</string>
- <string name="reset_dashboard_title" msgid="7423200250697886918">"Скинути параметри"</string>
+ <string name="reset_dashboard_title" msgid="7423200250697886918">"Варіанти скидання"</string>
<string name="reset_dashboard_summary" msgid="4390780188264852956">"Можна скинути налаштування мережі, додатків або пристрою"</string>
<string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Додатки може бути скинуто"</string>
<string name="reset_network_title" msgid="1395494440355807616">"Скинути параметри Wi-Fi, мобільного передавання даних і Bluetooth"</string>
@@ -1983,7 +1983,7 @@
<string name="default_emergency_app" msgid="1929974800666613803">"Додаток для екстрених викликів"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Скинути налаштування додатків"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Скинути налаштування додатків?"</string>
- <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків;"</li>\n<li>"сповіщень вимкнених додатків;"</li>\n<li>"додатків для виконання дій за умовчанням;"</li>\n<li>"обмежень щодо використання даних додатками у фоновому режимі;"</li>\n<li>"усіх обмежень щодо дозволів."</li>\n\n"Ви не втратите жодних даних додатків."</string>
+ <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків"</li>\n<li>"вимкнених сповіщень із додатків"</li>\n<li>"додатків за умовчанням"</li>\n<li>"обмежень щодо передавання даних у фоновому режимі"</li>\n<li>"усіх обмежень щодо дозволів"</li>\n\n"Дані додатків видалено не буде."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Скинути"</string>
<string name="manage_space_text" msgid="9013414693633572277">"Кер. простором"</string>
<string name="filter" msgid="9039576690686251462">"Фільтрув."</string>
@@ -3565,6 +3565,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматичне сортування сповіщень за релевантністю"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Відгук про адаптивні сповіщення"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указує зміни, внесені в сповіщення, і показує опцію для надсилання відгуку в систему"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Скинути важливість сповіщень"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Скинути налаштування важливості, змінені користувачем, і дозволити диспетчеру сповіщень визначати пріоритет"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Пропоновані дії та відповіді"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показувати пропоновані дії та відповіді"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Показувати нещодавні й відкладені сповіщення"</string>
@@ -3665,7 +3667,7 @@
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Показувати вгорі розділу розмов і в спливаючих чатах"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Показувати вгорі розділу розмов"</string>
<string name="other_conversations" msgid="551178916855139870">"Непріоритетні розмови"</string>
- <string name="other_conversations_summary" msgid="3487426787901236273">"Чати, до яких внесено зміни"</string>
+ <string name="other_conversations_summary" msgid="3487426787901236273">"Розмови, у які ви вносили зміни"</string>
<string name="recent_conversations" msgid="471678228756995274">"Нещодавні розмови"</string>
<string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Очистити нещодавні"</string>
<string name="clear" msgid="5092178335409471100">"Очистити"</string>
@@ -5007,11 +5009,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно, коли підключено до оператора <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Докладніше"</string>
<string name="see_less" msgid="2642392725363552793">"Показати менше"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Увімкнути оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Увімкнути SIM-карту?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Вибрати SIM-карту?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Активною може бути лише одна завантажена SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете іншого оператора, сервіс оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> не буде скасовано."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Підключення до мережі…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Активується сервіс оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не вдається змінити оператора"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не вдалося змінити оператора через помилку."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Вимкнути оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Вимкнути SIM-карту?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Вимкнення SIM-карти<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не вдається вимкнути оператора"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не вдається вимкнути оператора"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Сталася помилка. Не вдалося вимкнути оператора."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Використовувати дві SIM-карти?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На цьому пристрої можна водночас використовувати дві активні SIM-карти. Щоб і надалі використовувати лише одну SIM-карту, виберіть \"Ні, дякую\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Перезапустити пристрій?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Щоб почати роботу, перезапустіть пристрій. Тоді ви зможете додати ще одну SIM-карту."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Продовжити"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустити"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Ні, дякую"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Вибрати"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не вдається активувати SIM-карту"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Вийміть SIM-карту та вставте її знову. Якщо проблема не зникне, перезапустіть пристрій."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Спробуйте знову ввімкнути SIM-карту. Якщо проблема не зникне, перезапустіть пристрій."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Видалити цю завантажену SIM-карту?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Якщо ви видалите цю SIM-карту, послугу оператора \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\" буде скасовано на цьому пристрої.\n\nПослугу оператора \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\" не буде скасовано."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Видалити"</string>
@@ -5154,4 +5179,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Увімкнеться Bluetooth"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Увімкнено"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Вимкнено"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Інтернет"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карти"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Безпечні мережі в літаку"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Знаходьте безпечні мережі в літаку й підключайтеся до них"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"літак, безпечний у літаку"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Дзвінки та SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Дзвінки через Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Здійснюйте й отримуйте дзвінки через мережі Wi‑Fi, а не операторів мобільного зв\'язку"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Завдяки функції \"Дзвінки через Wi-Fi\" ви можете здійснювати та отримувати дзвінки не лише через мережі операторів мобільного зв\'язку, а й через Wi‑Fi.\n\nЗавдяки функції перехресних дзвінків ви можете здійснювати або отримувати дзвінки на одній SIM-карті за рахунок тарифного плану іншої."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Дзвінки"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index ca7864f..51cad71 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"مطابقت کے لحاظ سے خودکار طور پر درجہ کی اطلاعات"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تغیر پذیر اطلاع کے تاثرات"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"اطلاعات میں کی جانے والی ایڈجسٹمنٹس کی نشاندہی کریں اور سسٹم کو تاثرات فراہم کرنے کا اختیار دکھائیں"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"اطلاع کی اہمیت کو ری سیٹ کریں"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"صارف کی تبدیل کردہ اہمیت کی ترتیبات کو ری سیٹ کریں اور اطلاع کے اسسٹنٹ کو ترجیح دینے کی اجازت دیں"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"تجویز کردہ کارروائیاں اور جوابات"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"تجویز کردہ کارروائیوں اور جوابات کو خودکار طور پر دکھائیں"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"حالیہ اور اسنوز کردہ اطلاعات دکھائیں"</string>
@@ -4498,16 +4500,11 @@
<string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ٹیبلیٹ چیک کرنے کے لیے تھپتھپائیں"</string>
<string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"آلہ چیک کرنے کے لیے تھپتھپائیں"</string>
<string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
- <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
- <skip />
- <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
- <skip />
- <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
- <skip />
- <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
- <skip />
+ <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ہنگامی SOS"</string>
+ <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے زیر انتظام ہے"</string>
+ <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"5 بار پاور بٹن کو تیزی سے دبا کر SOS کی ہنگامی کاروائیوں کو شروع کریں۔"</string>
+ <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"وارننگ کی آواز"</string>
+ <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"کارروائیاں شروع کرنے سے پہلے الرٹ"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"فنگر پرنٹ سوائپ کریں"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
@@ -4850,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
<string name="see_more" msgid="7499355691042812723">"مزید دیکھیں"</string>
<string name="see_less" msgid="2642392725363552793">"کم دیکھیں"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آن کریں؟"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM آن کریں؟"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں؟"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM کارڈ استعمال کرنے کے لیے سوئچ کریں؟"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ایک وقت میں صرف ایک ڈاؤن لوڈ کردہ SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\nسوئچ کرنے سے آپ کے <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"نیٹ ورک سے منسلک ہو رہا ہے…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ ہو رہا ہے"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"کیریئر کو سوئچ نہیں کیا جا سکتا"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ایک خرابی کی وجہ سے کیریئر کو سوئچ نہیں کیا جا سکتا۔"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آف کریں؟"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM آف کریں؟"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"<xliff:g id="ELLIPSIS">…</xliff:g>SIM کو آف کیا جا رہا ہے"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"کیریئر کو غیر فعال نہیں کیا جا سکتا"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"کیریئر کو غیر فعال نہیں کیا جا سکتا"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"کچھ غلط ہوگیا اور آپ کے کیریئر کو غیر فعال نہیں کیا سکا۔"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIMs استعمال کریں؟"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"اس آلے میں ایک ہی وقت میں 2 فعال SIMs ہو سکتے ہے۔ ایک وقت میں 1 SIM کے استعمال کو جاری رکھنے کے لیے \"نہیں شکریہ\" پر تھپتھپائیں۔"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"آلہ ری اسٹارٹ کریں؟"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"شروع کرنے کے لیے اپنے آلے کو ری اسٹارٹ کریں۔ اس کے بعد آپ دوسرا SIM شامل کر سکتے ہیں۔"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"جاری رکھیں"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"ری سٹارٹ کریں"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"نہیں شکریہ"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"سوئچ کریں"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM کو فعال نہیں کیا جا سکتا"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM کو دوبارہ آن کرنے کی کوشش کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"ڈاؤن لوڈ کردہ اس SIM کو مٹائیں؟"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"اس SIM کو مٹانے سے اس آلہ سے <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> سروس ہٹ جاتی ہے۔\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"مٹائیں"</string>
@@ -4993,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوٹوتھ آن ہو جائے گا"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"آن"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"آف"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"انٹرنیٹ"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"ہوائی جہاز کیلئے محفوظ نیٹ ورکس"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ہوائی جہاز کیلئے محفوظ نیٹ ورکس کو تلاش کریں اور ان سے منسلک ہوں"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ہوائی جہاز، ہوائی جہاز کیلئے محفوظ"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"کالز اور SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi کالنگ"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi جیسے غیر کیریئر نیٹ ورکس پر کالز کریں اور موصول کریں"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi کالنگ آپ کو کچھ Wi-Fi نیٹ ورک جیسے غیر کیریئر نیٹ ورکس پر کالز کرنے اور موصول کرنے کی اجازت دیتی ہے۔\n\nکراس SIM کالنگ آپ کو کسی دوسری SIM سے کال کرنے اور موصول کرنے کیلئے کسی SIM کے موبائل ڈیٹا سے فائدہ اٹھانے کی اجازت دیتی ہے۔"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"کالز"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5840bb0..78cbf48 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2698,7 +2698,7 @@
<string name="credentials_install" msgid="3933218407598415827">"Sertifikat oʻrnatish"</string>
<string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
<string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Sertifikatlarni SD-kartadan o‘rnatish"</string>
- <string name="credentials_reset" msgid="4246628389366452655">"Hisob axborotini tozalash"</string>
+ <string name="credentials_reset" msgid="4246628389366452655">"Hisobga oid axborotni tozalash"</string>
<string name="credentials_reset_summary" msgid="5400585520572874255">"Barcha sertifikatlarni o‘chirib tashlash"</string>
<string name="trusted_credentials" msgid="2522784976058244683">"Ishonchli sertifikatlar"</string>
<string name="trusted_credentials_summary" msgid="345822338358409468">"Ishonchli CA sertifikatlarini chiqarish"</string>
@@ -2813,7 +2813,7 @@
<string name="really_remove_account_title" msgid="253097435885652310">"Hisob olib tashlansinmi?"</string>
<string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
<string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
- <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Ushbu hisob o‘chirilganda unga bog‘liq barcha xabar, kontakt va boshqa ma’lumotlar qurilmadan o‘chib ketadi."</string>
+ <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Bu hisobga tegishli barcha xabarlar, kontaktlar va boshqa maʼlumotlar ushbu qurilmadan oʻchirib tashlanadi!"</string>
<string name="remove_account_failed" msgid="3709502163548900644">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
<string name="cant_sync_dialog_title" msgid="2613000568881139517">"Qo‘lbola sinxronlanmadi"</string>
<string name="cant_sync_dialog_message" msgid="7612557105054568581">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirishnomalarni moslik asosida avtomatik tartiblash"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Moslashuvchan bildirishnoma amalini tanlash"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirishnomalarga kiritilgan oʻzgartirishlar va tizim amalini tanlash oynasi"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildirishnoma muhimligi sozlamalarini tiklash"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Foydalanuvchi oʻzgartirgan muhim sozlamalarni tiklang va ilovalarga bildirishnomalar muhimligini aniqlashga ruxsat bering"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tavsiya etiladigan amallar va javoblar"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tavsiya etiladigan amallar va javoblarni avtomatik chiqarish"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Oxirgi va keyinga qoldirilgan bildirishnomalar"</string>
@@ -3625,7 +3627,7 @@
<item quantity="one">%d ta ilova bildirishnomalarni o‘qishi mumkin</item>
</plurals>
<string name="notification_assistant_title" msgid="6983941403582134437">"Moslashuvchan bildirishnomalar"</string>
- <string name="no_notification_assistant" msgid="2533323397091834096">"Yoʻq"</string>
+ <string name="no_notification_assistant" msgid="2533323397091834096">"Hech qanday"</string>
<string name="no_notification_listeners" msgid="2839354157349636000">"O‘rnatilgan ilovalardan hech biri bildirishnomalarga kirish uchun ruxsat so‘ramagan."</string>
<string name="notification_access_detail_switch" msgid="46386786409608330">"Bildirishnomalarga ruxsat berish"</string>
<string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> uchun bildirishnomadan foydalanish ruxsati berilsinmi?"</string>
@@ -4728,7 +4730,7 @@
<string name="no_sim_card" msgid="1497407489810953863">"SIM karta solinmagan"</string>
<string name="sim_card" msgid="6381158752066377709">"SIM"</string>
<string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kartasiz"</string>
- <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Yoʻq"</string>
+ <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Hech qanday"</string>
<string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ulanish uchun SIM karta kerak"</string>
<string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ulanish uchun <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM kartasi kerak"</string>
<string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> bilan ishlamaydi"</string>
<string name="see_more" msgid="7499355691042812723">"Yana"</string>
<string name="see_less" msgid="2642392725363552793">"Kamroq"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> yoqilsinmi?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM karta yoqilsinmi?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> tanlansinmi?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kartadagi internetga almashsinmi?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Faqat bitta SIM kartani faollashtirish mumkin.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> yoqilganda <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xizmati bekor qilinmaydi."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Faqat bitta yuklab olingan SIM kartani faollashtirish mumkin.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> yoqilganda <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xizmati bekor qilinmaydi."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Faqat bitta SIM kartani faollashtirish mumkin.\n\nAlmashganda <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aloqasini bekor qilmaydi."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Bunga almashish: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Tarmoqqa ulanmoqda…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faollashtirilmoqda"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Aloqa operatori almashtirilmadi"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Xatolik tufayli aloqa operatori almashtirilmadi."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faolsizlantirilsinmi?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM karta faolsizlantirilsinmi?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM karta faolsizlantirmoqda<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Aloqa operatori faolsizlantirilmadi"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Aloqa operatori faolsizlantirilmadi"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xatolik yuz berdi va aloqa operatoringiz faolsizlantirilmadi."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ta SIM kartadan foydalanasizmi?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu qurilmada birdaniga 2 ta raqam faol boʻlishi mumkin. Hozircha 1 ta SIM kartadan foydalanishda davom etish uchun “Kerak emas” ustiga bosing"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Qurilma qayta ishga tushirilsinmi?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Ishga tushirish uchun qurilmani qayta ishga tushiring. Keyin esa boshqa SIM kartani kiritishingiz mumkin."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Davom etish"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Qayta yoqish"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Kerak emas"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Almashtirish"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM karta faollashmadi"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM kartani chiqarib olib, qaytadan soling. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM kartani qaytadan yoqing. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Mazkur yuklab olingan SIM karta axboroti tozalansinmi?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM karta axboroti tozalanganda bu qurilmadan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> xizmati ham tozalab tashlanadi.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> xizmati bekor qilinmaydi."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Tozalash"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth yoqiladi"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Yoniq"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Oʻchiq"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartalar"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Samolyotda xavfsiz tarmoqlar"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Samolyotda xavfsiz tarmoqlarni topish va ulanish"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolyot, samolyot uchun xavfsiz"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Chaqiruvlar va SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi chaqiruv"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Chaqiruvlarni mobil tarmoq orqali emas, Wi-Fi tarmoqlar orqali amalga oshirish va qabul qilish"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi chaqiruv funksiyasi mobil tarmoq ishlatmasdan Wi‑Fi tarmoqlar orqali chaqiruv qilish va chaqiruvlarni qabul qilish imkonini beradi.\n\nBunda, bir SIM kartadagi mobil internetdan foydalangan holda ikkinchi SIM kartadan Wi-Fi chaqiruv qilish ham mumkin."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Chaqiruvlar"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 506f7fd..c2e555c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1639,8 +1639,8 @@
<string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
<string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
<string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
- <string name="main_clear_final_desc" msgid="5800877928569039580">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn đều bị xóa. Bạn không thể hủy thao tác này."</string>
- <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tất cả thông tin cá nhân của bạn, kể cả SIM và ứng dụng đã tải xuống, đều bị xóa. Bạn không thể hủy thao tác này."</string>
+ <string name="main_clear_final_desc" msgid="5800877928569039580">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn đều bị xóa. Bạn không thể hủy thao tác này sau khi thực hiện."</string>
+ <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tất cả thông tin cá nhân của bạn, kể cả SIM và ứng dụng đã tải xuống, đều bị xóa. Bạn không thể hủy thao tác này sau khi thực hiện."</string>
<string name="main_clear_confirm_title" msgid="6577071819657853713">"Xóa mọi dữ liệu?"</string>
<string name="main_clear_not_available" msgid="3433795327146684827">"Người dùng này không thể thực hiện thao tác đặt lại về trạng thái ban đầu"</string>
<string name="main_clear_progress_title" msgid="7239741132015617719">"Đang xóa"</string>
@@ -1975,7 +1975,7 @@
<string name="system_package" msgid="7559476279008519360">"Không thể cài đặt bản cập nhật hệ thống trên phương tiện bên ngoài."</string>
<string name="move_error_device_admin" msgid="1561502976834303626">"Không thể cài đặt ứng dụng quản trị thiết bị trên phương tiện ngoài"</string>
<string name="force_stop_dlg_title" msgid="86745852555490146">"Buộc dừng?"</string>
- <string name="force_stop_dlg_text" msgid="1527286468544457368">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động sai."</string>
+ <string name="force_stop_dlg_text" msgid="1527286468544457368">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách."</string>
<string name="app_install_location_title" msgid="8932938164156303191">"Vị trí cài đặt ưa thích"</string>
<string name="app_install_location_summary" msgid="4948270795544357021">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
<string name="app_disable_dlg_positive" msgid="1414218905322009505">"Tắt ứng dụng"</string>
@@ -2408,7 +2408,7 @@
<string name="background_activity_summary_disabled" msgid="32459916080651444">"Ứng dụng không được phép chạy trong nền"</string>
<string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Không thể hạn chế sử dụng trong nền"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Giới hạn hoạt động nền?"</string>
- <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
+ <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
<string name="device_screen_usage" msgid="1011630249648289909">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
<string name="power_usage_list_summary" msgid="3237540201918492925">"Mức sử dụng pin kể từ lần sạc đầy"</string>
@@ -2811,9 +2811,9 @@
<string name="remove_account_label" msgid="4169490568375358010">"Xóa tài khoản"</string>
<string name="header_add_an_account" msgid="3919151542338822661">"Thêm tài khoản"</string>
<string name="really_remove_account_title" msgid="253097435885652310">"Xóa tài khoản?"</string>
- <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi máy tính bảng!"</string>
- <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi điện thoại!"</string>
- <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi thiết bị!"</string>
+ <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi máy tính bảng!"</string>
+ <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi điện thoại!"</string>
+ <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi thiết bị!"</string>
<string name="remove_account_failed" msgid="3709502163548900644">"Quản trị viên của bạn không cho phép thực hiện thay đổi này"</string>
<string name="cant_sync_dialog_title" msgid="2613000568881139517">"Không thể đồng bộ hóa theo cách thủ công"</string>
<string name="cant_sync_dialog_message" msgid="7612557105054568581">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Tự động sắp xếp các thông báo theo mức độ liên quan"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Phản hồi về tính năng thông báo thích ứng"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Cho biết những điều chỉnh được thực hiện đối với thông báo và hiển thị tùy chọn gửi ý kiến phản hồi cho hệ thống"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Đặt lại mức độ quan trọng của thông báo"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Đặt lại các tùy chọn cài đặt về mức độ quan trọng mà người dùng đã thay đổi và cho phép Trợ lý thông báo thiết lập mức độ ưu tiên"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Câu trả lời và hành động đề xuất"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tự động hiển thị câu trả lời và hành động đề xuất"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Hiển thị các thông báo gần đây và thông báo đã tạm ẩn"</string>
@@ -3583,10 +3585,10 @@
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Các cuộc trò chuyện ưu tiên sẽ hiển thị ở đầu ngăn kéo xuống. Bạn cũng có thể chuyển các cuộc trò chuyện này sang dạng bong bóng và tạm thời dừng chế độ Không làm phiền."</string>
<string name="conversation_onboarding_title" msgid="5194559958353468484">"Các cuộc trò chuyện ưu tiên và đã sửa đổi sẽ xuất hiện ở đây"</string>
<string name="conversation_onboarding_summary" msgid="2484845363368486941">"Sau khi bạn đánh dấu một cuộc trò chuyện là ưu tiên hoặc thực hiện bất kỳ sự thay đổi nào khác đối với các cuộc trò chuyện, thì những cuộc trò chuyện đó sẽ xuất hiện ở đây. \n\nCách thay đổi tùy chọn cài đặt cuộc trò chuyện: \nVuốt từ đầu màn hình xuống để mở ngăn kéo xuống rồi chạm và giữ cuộc trò chuyện."</string>
- <string name="notification_importance_min" msgid="4609688642942787774">"Hiển thị mà không phát âm báo và thu nhỏ"</string>
- <string name="notification_importance_low" msgid="7562535765919565273">"Hiển thị mà không phát âm báo"</string>
- <string name="notification_importance_default" msgid="7483906490369073043">"Phát âm báo"</string>
- <string name="notification_importance_high" msgid="8453789143477210550">"Phát âm báo và hiển thị trên màn hình"</string>
+ <string name="notification_importance_min" msgid="4609688642942787774">"Hiển thị mà không phát âm thanh và thu nhỏ"</string>
+ <string name="notification_importance_low" msgid="7562535765919565273">"Hiển thị mà không phát âm thanh"</string>
+ <string name="notification_importance_default" msgid="7483906490369073043">"Phát âm thanh"</string>
+ <string name="notification_importance_high" msgid="8453789143477210550">"Phát âm thanh và hiển thị trên màn hình"</string>
<string name="notification_importance_high_silent" msgid="8977232884004607985">"Hiển thị trên màn hình"</string>
<string name="notification_importance_min_title" msgid="7676541266705442501">"Thu nhỏ"</string>
<string name="notification_importance_low_title" msgid="658158049378796947">"Trung bình"</string>
@@ -3716,7 +3718,7 @@
<string name="app_notification_importance_title" msgid="8293193440040799998">"Mức độ quan trọng"</string>
<string name="notification_show_lights_title" msgid="5564315979007438583">"Nhấp nháy đèn"</string>
<string name="notification_vibrate_title" msgid="1422330728336623351">"Rung"</string>
- <string name="notification_channel_sound_title" msgid="9018031231387273476">"Âm báo"</string>
+ <string name="notification_channel_sound_title" msgid="9018031231387273476">"Âm thanh"</string>
<string name="notification_conversation_important" msgid="4365437037763608045">"Ưu tiên"</string>
<string name="notification_conversation_add_to_home" msgid="8136269431130231389">"Thêm vào nhà"</string>
<string name="zen_mode_rule_delete_button" msgid="7642063606919058862">"Xóa"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Xem thêm"</string>
<string name="see_less" msgid="2642392725363552793">"Xem bớt"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Bật <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Bật SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chuyển sang dùng thẻ SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Chỉ một SIM có thể hoạt động mỗi lần.\n\nKhi chuyển sang <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, dịch vụ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> của bạn sẽ không bị hủy."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Chỉ một SIM đã tải xuống có thể hoạt động mỗi lần.\n\nKhi chuyển sang <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, dịch vụ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> của bạn sẽ không bị hủy."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Chỉ một SIM có thể hoạt động mỗi lần.\n\nKhi chuyển đổi SIM, dịch vụ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> của bạn sẽ không bị hủy."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Đang kết nối mạng…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Đang chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Không thể chuyển đổi nhà mạng"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Không thể chuyển đổi nhà mạng do lỗi."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Tắt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Tắt SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Đang tắt SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Không thể tắt nhà mạng"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Không thể tắt nhà mạng"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Đã xảy ra lỗi nên bạn không thể tắt nhà mạng."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Dùng 2 SIM?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Thiết bị này có thể dùng 2 SIM cùng lúc. Để tiếp tục dùng 1 SIM mỗi lần, hãy nhấn vào \"Không, cảm ơn\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Khởi động lại thiết bị?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Để bắt đầu, hãy khởi động lại thiết bị. Sau đó, bạn có thể thêm một SIM khác."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Tiếp tục"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Khởi động lại"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Không, cảm ơn"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Chuyển"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Không thể kích hoạt SIM"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hãy tháo SIM rồi lắp lại. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Hãy thử bật lại SIM. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Xóa SIM đã tải xuống này?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Khi bạn xóa SIM, dịch vụ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sẽ bị xóa khỏi thiết bị này.\n\nDịch vụ của <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sẽ không bị hủy."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Xóa"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sẽ bật"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Đang bật"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Đang tắt"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Mạng an toàn trên máy bay"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Tìm và kết nối mạng an toàn trên máy bay"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"máy bay, an toàn trên máy bay"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Cuộc gọi và tin nhắn SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Gọi qua Wi-Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Với tính năng Gọi qua Wi-Fi, bạn có thể gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như một số mạng Wi‑Fi.\n\nTính năng gọi bằng nhiều SIM cho phép bạn tận dụng dữ liệu di động của một SIM để gọi và nhận cuộc gọi trên một SIM khác."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Cuộc gọi"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"Tin nhắn SMS"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b750933..d9f10b1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"按相关性自动排列通知"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"自适应通知反馈"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"显示对通知所做的调整以及用于向系统提供反馈的选项"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"重置通知的重要性级别"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"重置用户更改的重要性级别设置，允许通知助手排定优先级"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建议的操作和回复"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自动显示建议的操作和回复"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"显示近期通知和延后的通知"</string>
@@ -3577,7 +3579,7 @@
<string name="other_conversations" msgid="551178916855139870">"非优先对话"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"您已更改的对话"</string>
<string name="recent_conversations" msgid="471678228756995274">"近期对话"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的项目"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除近期项"</string>
<string name="clear" msgid="5092178335409471100">"清除"</string>
<string name="important_bubble" msgid="7911698275408390846">"以对话泡形式显示优先对话"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"优先对话会显示在下拉通知栏顶部。您也可将优先对话设置为以对话泡形式显示，并允许系统在“勿扰”模式下显示此类对话泡。"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"连接到<xliff:g id="CARRIER">%1$s</xliff:g>时无法使用"</string>
<string name="see_more" msgid="7499355691042812723">"查看更多"</string>
<string name="see_less" msgid="2642392725363552793">"隐藏部分"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要启用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要启用 SIM 卡吗？"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要切换为使用 SIM 卡吗？"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"一次只能启用一个 SIM 卡。\n\n切换到<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>不会取消<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>服务。"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"一次只能启用一个已下载的 SIM 卡。\n\n切换到<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>不会取消<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>服务。"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"一次只能启用一个 SIM 卡。\n\n进行切换并不会取消<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>服务。"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在连接到网络…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"无法切换运营商"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"发生错误，因此无法切换运营商。"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡吗？"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"无法停用运营商"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"无法停用运营商"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"出了点问题，无法停用您的运营商。"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 个 SIM 卡吗？"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"此设备可以同时激活 2 个 SIM 卡。如要继续一次只使用 1 个 SIM 卡，请点按“不用了”。"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"要重启设备吗？"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"如要开始使用，请重启您的设备。重启后即可添加其他 SIM 卡。"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"继续"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"重启"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"切换"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"无法激活 SIM 卡"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"请取出 SIM 卡，然后重新插入。如果问题仍然存在，请重启您的设备。"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"请尝试重新启用 SIM 卡。如果问题仍然存在，请重启您的设备。"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"要清空这个已下载的 SIM 卡吗？"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"清空此 SIM 卡将从此设备中移除<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>服务。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>的服务不会因此被取消。"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"清空"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"蓝牙将开启"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"开启"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"关闭"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"互联网"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"可在飞机上安全使用的网络"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"查找并连接到可在飞机上安全使用的网络"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飞机，可在飞机上安全使用"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"通话和短信"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN 通话"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"通过 WLAN 等非运营商网络接打电话"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"WLAN 通话功能支持您通过非运营商网络（例如某些 WLAN 网络）接打电话。\n\n跨 SIM 卡通话功能支持您利用一张 SIM 卡的移动数据流量，通过另一张 SIM 卡的号码接打电话。"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"通话"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"短信"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4bbda48..30d0f4e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -3478,6 +3478,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"自動按相關性為通知排序"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"對自動調整通知的意見"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示系統對通知作出的調整和提供意見的選項"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"重設通知重要性"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"重設使用者變更的重要設定，並允許通知助理優先處理"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議操作和回覆"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議操作和回覆"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"顯示近期和已延後的通知"</string>
@@ -3578,7 +3580,7 @@
<string name="other_conversations" msgid="551178916855139870">"非優先對話"</string>
<string name="other_conversations_summary" msgid="3487426787901236273">"已變更的對話"</string>
<string name="recent_conversations" msgid="471678228756995274">"最近的對話"</string>
- <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的項目"</string>
+ <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的聊天"</string>
<string name="clear" msgid="5092178335409471100">"清除"</string>
<string name="important_bubble" msgid="7911698275408390846">"優先對話用對話氣泡顯示"</string>
<string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先對話會在下拉式面板頂部顯示。您亦可設定用對話氣泡並在「請勿騷擾」模式中顯示優先對話。"</string>
@@ -4846,11 +4848,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連接至<xliff:g id="CARRIER">%1$s</xliff:g>時使用"</string>
<string name="see_more" msgid="7499355691042812723">"查看更多"</string>
<string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要啟用 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要啟用 SIM 卡嗎？"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要改用 SIM 卡嗎？"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"每次只可啟用一張 SIM 卡。\n\n切換至 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 將不會取消您的 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 服務。"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"每次只可啟用一張已下載的 SIM 卡。\n\n切換至 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 將不會取消您的 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 服務。"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"每次只可啟用一張 SIM 卡。\n\n改用其他服務將不會取消您的 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 服務。"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在連接至網絡…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"無法切換流動網絡供應商"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"發生錯誤，無法切換流動網絡供應商。"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"無法停用流動網絡供應商"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"無法停用流動網絡供應商"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生問題，無法停用您的流動網絡供應商。"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 張 SIM 卡嗎？"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"此裝置可以同時使用 2 張 SIM 卡。如要繼續每次使用一張 SIM 卡，請輕按 [不用了，謝謝]。"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"要重新啟動裝置嗎？"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"如要開始使用，請重新啟動您的裝置。然後您就可以新增其他 SIM 卡。"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"繼續"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"重新開始"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了，謝謝"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入。如果問題持續發生，請重新啟動裝置。"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請嘗試再次啟用 SIM 卡。如果問題持續發生，請重新啟動裝置。"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除這張已下載的 SIM 卡嗎？"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"清除此 SIM 卡即會從此裝置中移除 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 服務。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 的服務將不會被取消。"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
@@ -4989,4 +5014,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"開啟"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"互聯網"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"飛行安全網絡"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"尋找並連接飛行安全網絡"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛行, 飛行安全"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"通話和短訊"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi 通話"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"透過非流動網絡供應商網絡 (例如 Wi-Fi) 撥打和接聽電話"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi 通話讓您透過非流動網絡供應商網絡 (例如部分 Wi-Fi 網絡) 撥打和接聽電話。\n\n跨 SIM 卡通話讓您利用 SIM 卡的流動數據撥打和接聽來自另一張 SIM 卡的電話。"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"短訊"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 147cc078..b4a4be6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3477,6 +3477,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"依關聯性自動將通知排序"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"提供對自動調整通知優先順序功能的意見"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示對通知設定所做的調整和提供意見回饋的選項"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"重設通知重要性"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"重設使用者變更的重要設定，並允許通知助理優先處理"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議採取的動作和回覆"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議採取的動作和回覆"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"顯示近期通知和已延後的通知"</string>
@@ -4845,11 +4847,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連線到「<xliff:g id="CARRIER">%1$s</xliff:g>」時使用"</string>
<string name="see_more" msgid="7499355691042812723">"顯示更多"</string>
<string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要啟用「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要啟用 SIM 卡嗎？"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要改為使用 SIM 卡嗎？"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"一次只能啟用一張 SIM 卡。\n\n切換至「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」並不會取消「<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>」的服務。"</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"一次只能啟用一張已下載的 SIM 卡。\n\n切換至「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」不會取消「<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>」的服務。"</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"一次只能啟用一張 SIM 卡。\n\n切換電信業者並不會取消「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」的服務。"</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在連線到網路…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"無法切換電信業者"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"發生錯誤，因此無法切換電信業者。"</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"無法停用電信業者"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"無法停用電信業者"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生錯誤，無法停用你的電信業者。"</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 張 SIM 卡嗎？"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"這部裝置可以同時啟用 2 張 SIM 卡。如要繼續使用 1 張 SIM 卡，請輕觸 [不用了，謝謝]。"</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"要重新啟動裝置嗎？"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"如要開始使用，請重新啟動你的裝置。重新啟動後即可新增其他 SIM 卡。"</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"繼續"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"重新啟動"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了，謝謝"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入，如果問題持續發生，請重新啟動裝置。"</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請試著再次啟用 SIM 卡，如果問題持續發生，請重新啟動裝置。"</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除這張已下載的 SIM 卡嗎？"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"如果清除這張 SIM 卡，「<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>」服務會從這部裝置中移除。\n\n請放心，「<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>」的服務不會因此取消。"</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
@@ -4988,4 +5013,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"開啟"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"網際網路"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"飛航安全網路"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"尋找並連線到飛航安全網路"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛航, 飛航安全"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"通話和簡訊"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"透過諸如 Wi‑Fi 這類非電信業者提供的網路撥打電話及接聽來電"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Wi-Fi 通話功能可讓你透過非電信業者提供的網路 (例如某些 Wi‑Fi 網路) 撥打電話及接聽來電。\n\n跨 SIM 卡通話功能則可讓你使用某張 SIM 卡的行動數據，透過另一張 SIM 卡的號碼撥打電話及接聽來電。"</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"簡訊"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a42a282..5c654bb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -81,7 +81,7 @@
<string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"Idivayisi yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Nqamula"</string>
<string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
- <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhanqa idivayisi entsha"</string>
+ <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhangqa idivayisi entsha"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"i-bluetooth"</string>
<string name="bluetooth_is_visible_message" msgid="3811631869768157387">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
<string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Ikheli le-Bluetooth lefoni: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
<string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
<string name="bluetooth_off_footer" msgid="76578735660216295">"Vula i-Bluetooth ukuze ixhumeke kwamanye amadivayisi."</string>
<string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Amadivayisi akho"</string>
- <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Bhanqa idivayisi entsha"</string>
+ <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Bhangqa idivayisi entsha"</string>
<string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Vumela ithebhulethi yakho ukuxhumana namadivayisi e-Bluetooth aseduze"</string>
<string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Vumela idivayisi yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
<string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Vumela ifoni yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
@@ -698,7 +698,7 @@
<string name="bluetooth_settings" msgid="2967239493428695171">"Bluetooth"</string>
<string name="bluetooth_settings_title" msgid="2642029095769509647">"Bluetooth"</string>
<string name="bluetooth_settings_summary" msgid="6805458703566046784">"Lawula uxhumano, setha igama ledivaysi nokutholakala"</string>
- <string name="bluetooth_pairing_request" msgid="7762990650683525640">"Bhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+ <string name="bluetooth_pairing_request" msgid="7762990650683525640">"Bhangqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Ikhodi yokumatanisa ye-Bluetooth"</string>
<string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Thayipha ikhodi yokumatanisa bese ucindezela ku-Buyela noma ku-Enter"</string>
<string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"Iphinikhodi iqukethe amaletha namasimbui"</string>
@@ -720,7 +720,7 @@
<string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"Uxhumo lwe-inthanethi"</string>
<string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"Ikhibhodi"</string>
<string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"Oxhumana nabo nomlando wekholi"</string>
- <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Bhanqa nale divayisi"</string>
+ <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Bhangqa nale divayisi"</string>
<string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"Yabelana ngebhuku lefoni?"</string>
<string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukuifnyelela oxhumana nabo nomlando wekholi."</string>
<string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukubhanqa ne-Bluetooth. Uma ixhumekile, izokwazi ukufinyelela oxhumana nabo nomlando wekholi."</string>
@@ -3478,6 +3478,8 @@
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Linganisa ngokuzenzakalelayo izaziso ngokuhlobana"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Impendulo yesaziso sokujwayela"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bonisa ukulungiswa okwenziwe kuzaziso bese ubonisa inketho yokuhlinzeka ngempendulo kusistimu"</string>
+ <string name="asst_importance_reset_title" msgid="6191265591976440115">"Setha kabusha ukubaluleka kwesaziso"</string>
+ <string name="asst_importance_reset_summary" msgid="684794589254282667">"Setha kabusha amasethingi abalulekile ashintshiwe womsebenzisi bese uvumela umsizi wesaziso abe okubalulekile"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Izenzo eziphakanyisiwe nezimpendulo"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Bonisa ngokuzenzakalela izenzo eziphakanyisiwe nezimpendulo"</string>
<string name="notification_history_summary" msgid="5434741516307706892">"Bona izaziso zakamuva nezisnuziwe"</string>
@@ -4846,11 +4848,34 @@
<string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ayitholakali uma ixhumeke ku-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
<string name="see_more" msgid="7499355691042812723">"Bona okuningi"</string>
<string name="see_less" msgid="2642392725363552793">"Buka okuncane"</string>
+ <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vula i-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vula i-SIM?"</string>
+ <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+ <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Shintshela ekusebenziseni iSIM card lakho?"</string>
+ <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"I-SIM eyodwa kuphela engeziwa isebenze ngesikhathi esithile.\n\nUkushintshela ku-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ngeke kuze kukhansele isevisi yakho ye-<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"I-SIM eyodwa kuphela elandiwe engeziwa isebenze ngesikhathi esithile.\n\nUkushintshela ku-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ngeke kuze kukhansele isevisi yakho ye-<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"I-SIM eyodwa kuphela engenziwa isebenze ngesikhathi.\n\nUkushintsha ngeke kukhansele isevisi yakho ye-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+ <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ixhumeka kunethiwekhi…"</string>
+ <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+ <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ayikwazi ukushintsha inkampani yenethiwekhi"</string>
+ <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Inkampani yenethiwekhi ayikwazi ukushintshwa ngenxa yephutha."</string>
<string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vala i-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vala i-SIM?"</string>
<string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ivala i-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
- <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ayikwazi ukukhubaza inkampani yenethiwekhi"</string>
+ <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ayikwazi ukukhubaza inkampani yenethiwekhi"</string>
<string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kukhona okungahambanga kahle futhi inkampani yakho yenethiwekhi ayikwazanga ukukhutshazwa."</string>
+ <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Sebenzisa ama-SIM angu-2?"</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Le divayisi ingaba nama-SIM angu-2 ngesikhathi esisodwa. Ukuze uqhubeke nokusebenzisa i-SIM engu-1 ngesikhathi, thepha okuthi \"Cha ngiyabonga\"."</string>
+ <string name="sim_action_restart_title" msgid="7054617569121993825">"Qalisa kabusha idivayisi?"</string>
+ <string name="sim_action_restart_text" msgid="8019300474703571013">"Ukuze qalise, qalisa kabusha idivayisi yakho. Bese ungangeza enye i-SIM."</string>
+ <string name="sim_action_continue" msgid="1688813133152389943">"Qhubeka"</string>
+ <string name="sim_action_reboot" msgid="3508948833333441538">"Qala kabusha"</string>
+ <string name="sim_action_no_thanks" msgid="435717748384544195">"Cha ngiyabonga"</string>
+ <string name="sim_switch_button" msgid="1405772571706095387">"Shintsha"</string>
+ <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Akukwazi ukwenza i-SIM isebenze"</string>
+ <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Khipha i-SIM yakho bese uyifake futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
+ <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zama ukuvula i-SIM futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
<string name="erase_sim_dialog_title" msgid="881253002169177016">"Sula le SIM elandiwe?"</string>
<string name="erase_sim_dialog_text" msgid="753031064269699885">"Ukusula le-SIM kususa isevisi ye-<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> kusukela kule divayisi.\n\nIsevisi ye-<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ngeke ize ikhanselwe."</string>
<string name="erase_sim_confirm_button" msgid="8309115684335320541">"Sula"</string>
@@ -4989,4 +5014,15 @@
<string name="connected_device_see_all_summary" msgid="2056010318537268108">"I-Bluetooth izovuleka"</string>
<string name="bluetooth_setting_on" msgid="4808458394436224124">"Vuliwe"</string>
<string name="bluetooth_setting_off" msgid="4965493913199554789">"Valiwe"</string>
+ <string name="provider_internet_settings" msgid="3831259474776313323">"I-inthanethi"</string>
+ <string name="provider_network_settings_title" msgid="2624756136016346774">"Ama-SIM"</string>
+ <string name="airplane_safe_networks" msgid="8689587134664565669">"Amanethiwekhi aphephile wendiza"</string>
+ <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Thola futhi xhuma kumanethiwekhi aphephile wendiza"</string>
+ <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"indiza, kuphephile kwindiza"</string>
+ <string name="calls_and_sms" msgid="1931855083959003306">"Amakholi ne-SMS"</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Ukushaya kwe-Wi‑Fi"</string>
+ <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Yenza futhi thola amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njenge-Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="148659606229186084">"Ukushaya kwe-Wi-Fi kukuvumela ukuthi wenze futhi uthole amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njengamanye amanethiwekhi we-Wi‑Fi.\n\nUkushaya kwama-SIM amaningi kukuvumela ukuthi ulinganise idatha yeselula ye-SIM ukwenza nokuthola amakholi kusuka kwenye i-SIM."</string>
+ <string name="calls_preference_title" msgid="7536882032182563800">"Amakholi"</string>
+ <string name="sms_preference_title" msgid="8392745501754864395">"I-SMS"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 347e22f..28908d7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9166,6 +9166,9 @@
}
</string>
+ <!-- [CHAR LIMIT=50] Zen mode settings: placeholder for a Contact name when the name is empty -->
+ <string name="zen_mode_starred_contacts_empty_name">(No name)</string>
+
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
<string name="zen_mode_messages">Messages</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
@@ -10469,6 +10472,9 @@
<!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] -->
<string name="wifi_data_usage">Wi\u2011Fi data usage</string>
+ <!-- Label for non-carrier data usage in data usage screen [CHAR LIMIT=60] -->
+ <string name="non_carrier_data_usage">Non-carrier data usage</string>
+
<!-- Label for ethernet data usage in data usage screen [CHAR LIMIT=60] -->
<string name="ethernet_data_usage">Ethernet data usage</string>
@@ -10517,6 +10523,9 @@
<!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
<string name="operator_warning">Carrier data accounting may differ from device accounting</string>
+ <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] -->
+ <string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string>
+
<!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
<string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
@@ -11061,13 +11070,13 @@
<string name="emergency_gesture_entrypoint_summary">Managed by <xliff:g id="app_name" example="Emergency Info">%1$s</xliff:g></string>
<!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
- <string name="emergency_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>
+ <string name="emergency_gesture_screen_summary">Start the actions below by pressing the power button quickly 5 times or more</string>
<!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
- <string name="emergency_gesture_sound_setting_title">Warning sound</string>
+ <string name="emergency_gesture_sound_setting_title">Countdown alarm</string>
<!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
- <string name="emergency_gesture_sound_setting_summary">Alert before starting the actions</string>
+ <string name="emergency_gesture_sound_setting_summary">Play a loud sound before calling</string>
<!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
@@ -11981,6 +11990,30 @@
<string name="see_less">See less</string>
<!-- Strings for toggling subscriptions dialog activity -->
+ <!-- Title of confirmation dialog asking the user if they want to enable subscription. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_enable_sub_dialog_title">Turn on <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+ <!-- Title of confirmation dialog asking the user if they want to enable subscription without the subscription name. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_enable_sub_dialog_title_without_carrier_name">Turn on SIM?</string>
+ <!-- Title of confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_title">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+ <!-- Title of confirmation dialog asking the user if they want to switch to the SIM card. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_psim_dialog_title">Switch to using SIM card?</string>
+ <!-- Body text of confirmation dialog for switching subscription that involves switching SIM slots. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_text">Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+ <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one downloaded SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_text_downloaded">Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+ <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_text_single_sim">Only one SIM can be active at a time.\n\nSwitching won\u2019t cancel your <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> service.</string>
+ <!-- Text of confirm button in the confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_confirm">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+ <!-- Status message indicating the device is in the process of disconnecting from one mobile network and immediately connecting to another. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_enabling_sim_without_carrier_name">Connecting to network…</string>
+ <!-- Text of progress dialog indicating the subscription switch is in progress. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_switch_sub_dialog_progress">Switching to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+ <!-- Title of error message indicating that the device could not disconnect from one mobile network and immediately connect to another. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_enable_sim_fail_title">Can\u2019t switch carrier</string>
+ <!-- Body text of error message indicating the device could not disconnect from one mobile network and immediately connect to another, due to an unspecified issue. [CHAR_LIMIT=NONE] -->
+ <string name="sim_action_enable_sim_fail_text">The carrier can\u2019t be switched due to an error.</string>
<!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
<string name="privileged_action_disable_sub_dialog_title">Turn off <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
<!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
@@ -11988,9 +12021,31 @@
<!-- Disabling SIMs progress dialog message [CHAR LIMIT=NONE] -->
<string name="privileged_action_disable_sub_dialog_progress">Turning off SIM<xliff:g id="ellipsis" example="...">…</xliff:g></string>
<!-- Title of error messaging indicating the device could not disable the mobile network. [CHAR LIMIT=NONE] -->
- <string name="privileged_action_disable_fail_title">Can\'t disable carrier</string>
+ <string name="privileged_action_disable_fail_title">Can\u2019t disable carrier</string>
<!-- Body text of error message indicating the device could not disable the mobile network, due to an unknown issue. [CHAR LIMIT=NONE] -->
<string name="privileged_action_disable_fail_text">Something went wrong and your carrier could not be disabled.</string>
+ <!-- Title on a dialog asking the users whether they want to enable DSDS mode. [CHAR LIMIT=NONE] -->
+ <string name="sim_action_enable_dsds_title">Use 2 SIMs?</string>
+ <!-- Message in a dialog indicating the user can enable DSDS mode. [CHAR LIMIT=NONE] -->
+ <string name="sim_action_enable_dsds_text">This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\".</string>
+ <!-- Ask the user whether to restart device. [CHAR LIMIT=NONE] -->
+ <string name="sim_action_restart_title">Restart device?</string>
+ <!-- Tell the user that in order to enable DSDS mode, the phone needs to restart. [CHAR LIMIT=NONE] -->
+ <string name="sim_action_restart_text">To get started, restart your device. Then you can add another SIM.</string>
+ <!-- Button on a dialog to confirm SIM operations. [CHAR LIMIT=30] -->
+ <string name="sim_action_continue">Continue</string>
+ <!-- User confirms reboot the phone. [CHAR LIMIT=30] -->
+ <string name="sim_action_reboot">Restart</string>
+ <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
+ <string name="sim_action_no_thanks">No thanks</string>
+ <!-- Button which will disconnect the user from one mobile network and immediately connect to another. [CHAR LIMIT=30] -->
+ <string name="sim_switch_button">Switch</string>
+ <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->
+ <string name="dsds_activation_failure_title">Can\u2019t activate SIM</string>
+ <!-- Body text of DSDS activation failure dialog. Users could reinsert the SIM card or reboot to recover. [CHAR LIMIT=NONE] -->
+ <string name="dsds_activation_failure_body_msg1">Remove the SIM and insert it again. If the problem continues, restart your device.</string>
+ <!-- Body text of DSDS activation failure dialog. Users could toggle the selected SIM again or reboot to recover. [CHAR LIMIT=NONE] -->
+ <string name="dsds_activation_failure_body_msg2">Try turning on the SIM again. If the problem continues, restart your device.</string>
<!-- Strings for deleting eUICC subscriptions dialog activity -->
<!-- Title on confirmation dialog asking the user if they want to erase the downloaded SIM from the device. [CHAR_LIMIT=NONE] -->
@@ -12374,4 +12429,11 @@
<string name="calls_preference_title">Calls</string>
<!-- Provider Model: SMS preference title -->
<string name="sms_preference_title">SMS</string>
+ <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
+ <string name="network_and_internet_preferences_title">Preferences</string>
+ <!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
+ <string name="network_and_internet_preferences_summary">Connect to public networks</string>
+
+ <!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
+ <string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
</resources>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 3c171a1..98ab28d 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -211,4 +211,13 @@
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
</style>
-</resources>
+
+ <!-- DayNight themes -->
+ <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
+ <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
+ <style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
+ <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
+ <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
+ <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
+ <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat.Light" />
+</resources>
\ No newline at end of file
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fcc6bcc..6781e28 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -90,7 +90,7 @@
android:key="toggle_force_bold_text"
android:persistent="false"
android:title="@string/force_bold_text"
- settings:controller="com.android.settings.accessibility.ForceBoldTextPreferenceController"/>
+ settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
new file mode 100644
index 0000000..3ec4a29
--- /dev/null
+++ b/res/xml/apps.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="apps_and_notification_screen"
+ android:title="@string/app_and_notification_dashboard_title"
+ settings:initialExpandedChildrenCount="4">
+ <!-- the initial count should include the dynamic tiles -->
+
+ <Preference
+ android:key="all_app_info"
+ android:title="@string/applications_settings"
+ android:order="-999"
+ android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+ settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"
+ settings:keywords="@string/keywords_applications_settings"/>
+
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="recent_open_apps"
+ android:title="@string/recent_app_category_title"
+ android:layout="@layout/app_entities_header"
+ android:selectable="false"
+ android:order="-998"
+ settings:allowDividerBelow="true"
+ settings:controller="com.android.settings.applications.RecentAppsPreferenceController"/>
+
+ <!-- Empty category to draw divider -->
+ <PreferenceCategory
+ android:key="recent_apps_divider"
+ android:layout="@layout/preference_category_no_label"
+ android:order="-997"/>
+
+ <Preference
+ android:key="conversations"
+ android:title="@string/conversations_category_title"
+ android:order="-550"
+ settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
+ android:fragment="com.android.settings.notification.app.ConversationListSettings"
+ />
+
+ <!-- Notifications (appears before manage_perms), default apps (appears after) -->
+ <PreferenceCategory
+ android:key="dashboard_tile_placeholder"
+ android:order="10"/>
+
+ <Preference
+ android:key="default_apps"
+ android:title="@string/app_default_dashboard_title"
+ android:order="11"
+ settings:controller="com.android.settings.applications.DefaultAppsPreferenceController">
+ <intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/>
+ </Preference>
+
+ <Preference
+ android:key="manage_perms"
+ android:title="@string/app_permissions"
+ android:summary="@string/runtime_permissions_summary_control_app_access"
+ android:order="12"
+ settings:keywords="@string/keywords_app_permissions">
+ <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
+ </Preference>
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="app_and_notif_cell_broadcast_settings"
+ android:title="@string/cell_broadcast_settings"
+ android:order="15"
+ settings:useAdminDisabledSummary="true">
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="@string/cell_broadcast_receiver_package"
+ android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
+ </com.android.settingslib.RestrictedPreference>
+
+ <Preference
+ android:key="special_access"
+ android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"
+ android:title="@string/special_access"
+ android:order="20"
+ settings:controller="com.android.settings.applications.SpecialAppAccessPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/data_usage_list.xml b/res/xml/data_usage_list.xml
index 41fbff8..9ea6a91 100644
--- a/res/xml/data_usage_list.xml
+++ b/res/xml/data_usage_list.xml
@@ -23,9 +23,15 @@
android:key="chart_data" />
<Preference
+ android:key="operator_warning"
android:summary="@string/operator_warning"
android:selectable="false" />
+ <Preference
+ android:key="non_carrier_data_usage_warning"
+ android:summary="@string/non_carrier_data_usage_warning"
+ android:selectable="false" />
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 20fac45..43a797a 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -52,6 +52,14 @@
settings:userRestriction="no_config_date_time"
settings:keywords="@string/keywords_time_zone"/>
+ <!-- This preference gets removed if location-based time zone detection is not supported -->
+ <com.android.settingslib.RestrictedPreference
+ android:key="location_time_zone_detection"
+ android:title="@string/location_time_zone_detection_screen_title"
+ settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"
+ android:fragment="com.android.settings.datetime.locationtimezone.TimeZoneDetectionSettings"
+ settings:userRestriction="no_config_date_time"/>
+
<PreferenceCategory
android:key="time_format_preference_category"
android:title="@string/time_format_category_title"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 46bd305..f06ed2e 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -532,6 +532,11 @@
android:title="@string/usb_audio_disable_routing"
android:summary="@string/usb_audio_disable_routing_summary" />
+ <Preference
+ android:key="transcode_settings"
+ android:title="@string/transcode_settings_title"
+ android:fragment="com.android.settings.development.transcode.TranscodeSettingsFragment" />
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
index bc07366..b1e77c2 100644
--- a/res/xml/emergency_gesture_settings.xml
+++ b/res/xml/emergency_gesture_settings.xml
@@ -25,14 +25,11 @@
app:animation="@raw/gesture_double_tap"
app:preview="@drawable/gesture_double_tap"/>
- <SwitchPreference
- android:key="gesture_emergency_button"
- android:title="@string/emergency_gesture_screen_title"
- android:summary="@string/emergency_gesture_screen_summary"
- android:icon="@drawable/ic_hand_gesture"
- app:keywords="@string/keywords_gesture"
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="gesture_emergency_button_switch_bar"
+ android:layout="@layout/emergency_gesture_switch_bar"
app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController"
- app:allowDividerAbove="true"/>
+ app:allowDividerBelow="true"/>
<SwitchPreference
android:key="emergency_gesture_sound"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 2f38d91..32dad20 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -24,7 +24,7 @@
android:key="gesture_emergency_summary"
android:title="@string/emergency_gesture_screen_title"
android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
- settings:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />
+ settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
<Preference
android:key="gesture_assist_input_summary"
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 80f4973..fb03f4c 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -65,13 +65,6 @@
settings:forWork="true"
settings:useAdminDisabledSummary="true"/>
- <!-- This preference gets removed if location-based time zone detection is not supported -->
- <Preference
- android:key="location_time_zone_detection"
- android:title="@string/location_time_zone_detection_screen_title"
- settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
- android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />
-
<PreferenceCategory
android:key="location_services"
android:layout="@layout/preference_category_no_label"
diff --git a/res/xml/location_settings_personal.xml b/res/xml/location_settings_personal.xml
index 3bd7b6e..de8ed81 100644
--- a/res/xml/location_settings_personal.xml
+++ b/res/xml/location_settings_personal.xml
@@ -51,13 +51,6 @@
android:fragment="com.android.settings.location.ScanningSettings"
settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
- <!-- This preference gets removed if location-based time zone detection is not supported -->
- <Preference
- android:key="location_time_zone_detection"
- android:title="@string/location_time_zone_detection_screen_title"
- settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
- android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />
-
<PreferenceCategory
android:key="location_services"
android:layout="@layout/preference_category_no_label"
diff --git a/res/xml/location_time_zone_detection.xml b/res/xml/location_time_zone_detection.xml
index 7f0c248..9f5e775 100644
--- a/res/xml/location_time_zone_detection.xml
+++ b/res/xml/location_time_zone_detection.xml
@@ -22,7 +22,7 @@
<SwitchPreference
android:title="@string/location_time_zone_detection_enabled_title"
android:summary="@string/location_time_zone_detection_enabled_description"
- settings:controller="com.android.settings.location.TimeZoneDetectionTogglePreferenceController"
+ settings:controller="com.android.settings.datetime.locationtimezone.TimeZoneDetectionTogglePreferenceController"
android:key="location_time_zone_detection_enabled" />
</PreferenceScreen>
diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
index 778def0..a3fecf6 100644
--- a/res/xml/network_provider_settings.xml
+++ b/res/xml/network_provider_settings.xml
@@ -33,7 +33,8 @@
<Preference
android:key="configure_wifi_settings"
- android:title="@string/wifi_configure_settings_preference_title"
+ android:title="@string/network_and_internet_preferences_title"
+ android:summary="@string/network_and_internet_preferences_summary"
settings:allowDividerAbove="true"
android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
@@ -43,6 +44,6 @@
android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
<com.android.settings.datausage.DataUsagePreference
- android:key="wifi_data_usage"
- android:title="@string/wifi_data_usage"/>
+ android:key="non_carrier_data_usage"
+ android:title="@string/non_carrier_data_usage"/>
</PreferenceScreen>
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index dc78f47..8f4c68b 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -22,13 +22,13 @@
<PreferenceCategory
android:key="connectivity"
- android:order="-120"
+ android:order="-130"
settings:allowDividerAbove="false">
<Preference
android:fragment="com.android.settings.network.NetworkDashboardFragment"
android:icon="@drawable/ic_homepage_network"
android:key="top_level_network"
- android:order="-120"
+ android:order="-130"
android:title="@string/network_dashboard_title"
settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
@@ -36,21 +36,30 @@
android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
android:icon="@drawable/ic_homepage_connected_device"
android:key="top_level_connected_devices"
- android:order="-110"
+ android:order="-120"
android:title="@string/connected_devices_dashboard_title"
settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="apps"
- android:order="-100"
+ android:order="-110"
settings:allowDividerAbove="false">
<Preference
android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
android:icon="@drawable/ic_homepage_apps"
android:key="top_level_apps_and_notifs"
- android:order="-100"
+ android:order="-110"
android:title="@string/app_and_notification_dashboard_title"/>
+
+ <Preference
+ android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+ android:icon="@drawable/ic_homepage_notification"
+ android:key="top_level_notification"
+ android:order="-100"
+ android:title="@string/configure_notification_settings"/>
+
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/transcode_settings.xml b/res/xml/transcode_settings.xml
new file mode 100644
index 0000000..9fff3fd
--- /dev/null
+++ b/res/xml/transcode_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/transcode_settings_title"
+ settings:searchable="false">
+
+ <SwitchPreference
+ android:key="transcode_enable_all"
+ android:title="@string/transcode_enable_all"
+ settings:controller="com.android.settings.development.transcode.TranscodeGlobalTogglePreferenceController" />
+
+ <PreferenceCategory
+ android:key="transcode_skip_apps"
+ android:title="@string/transcode_skip_apps"
+ settings:controller="com.android.settings.development.transcode.TranscodeSkipAppsPreferenceController" />
+</PreferenceScreen>
diff --git a/src/com/android/settings/AsyncTaskSidecar.java b/src/com/android/settings/AsyncTaskSidecar.java
new file mode 100644
index 0000000..31c8298
--- /dev/null
+++ b/src/com/android/settings/AsyncTaskSidecar.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.os.AsyncTask;
+
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.concurrent.Future;
+
+/** A {@link SidecarFragment} which uses an {@link AsyncTask} to perform background work. */
+public abstract class AsyncTaskSidecar<Param, Result> extends SidecarFragment {
+
+ private Future<Result> mAsyncTask;
+
+ @Override
+ public void onDestroy() {
+ if (mAsyncTask != null) {
+ mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+ }
+
+ super.onDestroy();
+ }
+
+ /**
+ * Executes the background task.
+ *
+ * @param param parameters passed in from {@link #run}
+ */
+ protected abstract Result doInBackground(@Nullable Param param);
+
+ /** Handles the background task's result. */
+ protected void onPostExecute(Result result) {}
+
+ /** Runs the sidecar and sets the state to RUNNING. */
+ public void run(@Nullable final Param param) {
+ setState(State.RUNNING, Substate.UNUSED);
+
+ if (mAsyncTask != null) {
+ mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+ }
+
+ mAsyncTask =
+ ThreadUtils.postOnBackgroundThread(
+ () -> {
+ Result result = doInBackground(param);
+ ThreadUtils.postOnMainThread(() -> onPostExecute(result));
+ });
+ }
+}
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index c65cda7..4ab197d 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -62,8 +62,8 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
- super.onApplyThemeResource(theme, resid, first);
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ super.onApplyThemeResource(theme, new_resid, first);
}
@Override
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 77cc03e..a9b5b31 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -30,6 +30,7 @@
import android.os.Message;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
+import android.telephony.PinResult;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -532,30 +533,25 @@
mPinToggle.setEnabled(false);
}
- private class SetIccLockEnabled extends AsyncTask<Void, Void, Void> {
+ private class SetIccLockEnabled extends AsyncTask<Void, Void, PinResult> {
private final boolean mState;
- private final String mPassword;
- private int mAttemptsRemaining;
+ private final String mPin;
private SetIccLockEnabled(boolean state, String pin) {
mState = state;
- mPassword = pin;
+ mPin = pin;
}
@Override
- protected Void doInBackground(Void... params) {
+ protected PinResult doInBackground(Void... params) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
- mAttemptsRemaining = mTelephonyManager.setIccLockEnabled(mState, mPassword);
- return null;
+ return mTelephonyManager.setIccLockEnabled(mState, mPin);
}
@Override
- protected void onPostExecute(Void aVoid) {
- if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
- iccLockChanged(true, mAttemptsRemaining);
- } else {
- iccLockChanged(false, mAttemptsRemaining);
- }
+ protected void onPostExecute(PinResult pinResult) {
+ iccLockChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+ pinResult.getAttemptsRemaining() /* attemptsRemaining */);
}
}
@@ -641,33 +637,28 @@
}
private void tryChangePin() {
- new ChangeIccLockPassword(mOldPin, mNewPin).execute();
+ new ChangeIccLockPin(mOldPin, mNewPin).execute();
}
- private class ChangeIccLockPassword extends AsyncTask<Void, Void, Void> {
- private final String mOldPwd;
- private final String mNewPwd;
- private int mAttemptsRemaining;
+ private class ChangeIccLockPin extends AsyncTask<Void, Void, PinResult> {
+ private final String mOldPin;
+ private final String mNewPin;
- private ChangeIccLockPassword(String oldPin, String newPin) {
- mOldPwd = oldPin;
- mNewPwd = newPin;
+ private ChangeIccLockPin(String oldPin, String newPin) {
+ mOldPin = oldPin;
+ mNewPin = newPin;
}
@Override
- protected Void doInBackground(Void... params) {
+ protected PinResult doInBackground(Void... params) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
- mAttemptsRemaining = mTelephonyManager.changeIccLockPassword(mOldPwd, mNewPwd);
- return null;
+ return mTelephonyManager.changeIccLockPin(mOldPin, mNewPin);
}
@Override
- protected void onPostExecute(Void aVoid) {
- if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
- iccPinChanged(true, mAttemptsRemaining);
- } else {
- iccPinChanged(false, mAttemptsRemaining);
- }
+ protected void onPostExecute(PinResult pinResult) {
+ iccPinChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+ pinResult.getAttemptsRemaining() /* attemptsRemaining */);
}
}
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index bce6f3f..e0292ef 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -19,6 +19,7 @@
import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_FIRST_RUN;
import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.sysprop.SetupWizardProperties;
@@ -39,25 +40,39 @@
return theme;
}
- public static int getTheme(Intent intent) {
+ public static int getTheme(Context context, Intent intent) {
String theme = getThemeString(intent);
// TODO(yukl): Move to ThemeResolver and add any additional required attributes in
// onApplyThemeResource using Theme overlays
if (theme != null) {
if (WizardManagerHelper.isAnySetupWizard(intent)) {
- switch (theme) {
- case ThemeHelper.THEME_GLIF_V3_LIGHT:
- return R.style.GlifV3Theme_Light;
- case ThemeHelper.THEME_GLIF_V3:
- return R.style.GlifV3Theme;
- case ThemeHelper.THEME_GLIF_V2_LIGHT:
- return R.style.GlifV2Theme_Light;
- case ThemeHelper.THEME_GLIF_V2:
- return R.style.GlifV2Theme;
- case ThemeHelper.THEME_GLIF_LIGHT:
- return R.style.GlifTheme_Light;
- case ThemeHelper.THEME_GLIF:
- return R.style.GlifTheme;
+ if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+ switch (theme) {
+ case ThemeHelper.THEME_GLIF_V3_LIGHT:
+ case ThemeHelper.THEME_GLIF_V3:
+ return R.style.GlifV3Theme_DayNight;
+ case ThemeHelper.THEME_GLIF_V2_LIGHT:
+ case ThemeHelper.THEME_GLIF_V2:
+ return R.style.GlifV2Theme_DayNight;
+ case ThemeHelper.THEME_GLIF_LIGHT:
+ case ThemeHelper.THEME_GLIF:
+ return R.style.GlifTheme_DayNight;
+ }
+ } else {
+ switch (theme) {
+ case ThemeHelper.THEME_GLIF_V3_LIGHT:
+ return R.style.GlifV3Theme_Light;
+ case ThemeHelper.THEME_GLIF_V3:
+ return R.style.GlifV3Theme;
+ case ThemeHelper.THEME_GLIF_V2_LIGHT:
+ return R.style.GlifV2Theme_Light;
+ case ThemeHelper.THEME_GLIF_V2:
+ return R.style.GlifV2Theme;
+ case ThemeHelper.THEME_GLIF_LIGHT:
+ return R.style.GlifTheme_Light;
+ case ThemeHelper.THEME_GLIF:
+ return R.style.GlifTheme;
+ }
}
} else {
switch (theme) {
@@ -76,17 +91,30 @@
return R.style.GlifTheme;
}
- public static int getTransparentTheme(Intent intent) {
- final int suwTheme = getTheme(intent);
- int transparentTheme = R.style.GlifV2Theme_Light_Transparent;
- if (suwTheme == R.style.GlifV3Theme) {
- transparentTheme = R.style.GlifV3Theme_Transparent;
+ public static int getTransparentTheme(Context context, Intent intent) {
+ int transparentTheme;
+ final int suwTheme = getTheme(context, intent);
+ if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+ transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+ } else {
+ transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+ }
+ if (suwTheme == R.style.GlifV3Theme_DayNight) {
+ transparentTheme = R.style.GlifV3Theme_DayNight_Transparent;
} else if (suwTheme == R.style.GlifV3Theme_Light) {
transparentTheme = R.style.GlifV3Theme_Light_Transparent;
- } else if (suwTheme == R.style.GlifV2Theme) {
- transparentTheme = R.style.GlifV2Theme_Transparent;
+ } else if (suwTheme == R.style.GlifV2Theme_DayNight) {
+ transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+ } else if (suwTheme == R.style.GlifV2Theme_Light) {
+ transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+ } else if (suwTheme == R.style.GlifTheme_DayNight) {
+ transparentTheme = R.style.SetupWizardTheme_DayNight_Transparent;
} else if (suwTheme == R.style.GlifTheme_Light) {
transparentTheme = R.style.SetupWizardTheme_Light_Transparent;
+ } else if (suwTheme == R.style.GlifV3Theme) {
+ transparentTheme = R.style.GlifV3Theme_Transparent;
+ } else if (suwTheme == R.style.GlifV2Theme) {
+ transparentTheme = R.style.GlifV2Theme_Transparent;
} else if (suwTheme == R.style.GlifTheme) {
transparentTheme = R.style.SetupWizardTheme_Transparent;
}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f9359a2..b6a9f59 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -83,6 +83,7 @@
import android.text.format.DateUtils;
import android.text.style.TtsSpan;
import android.util.ArraySet;
+import android.util.FeatureFlagUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.LayoutInflater;
@@ -1146,4 +1147,9 @@
drawable.draw(canvas);
return roundedBitmap;
}
+
+ public static boolean isProviderModelEnabled(Context context) {
+ return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
+ }
+
}
diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
index e91f2a2..58cdb72 100644
--- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
+
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
@@ -30,6 +32,9 @@
import android.util.Log;
import android.view.accessibility.AccessibilityManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
@@ -37,6 +42,7 @@
import com.android.settingslib.accessibility.AccessibilityUtils;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
@@ -61,44 +67,77 @@
return;
}
- // In case the A11yServiceInfo doesn't exist, go to ally services list.
final ComponentName componentName = ComponentName.unflattenFromString(extraComponentName);
+ if (openSystemAccessibilitySettingsAndFinish(componentName)) {
+ return;
+ }
+
+ if (openAccessibilityDetailsSettingsAndFinish(componentName)) {
+ return;
+ }
+ // Fall back to open accessibility services list.
+ openAccessibilitySettingsAndFinish();
+ }
+
+ private boolean openSystemAccessibilitySettingsAndFinish(
+ @Nullable ComponentName componentName) {
+ final LaunchFragmentArguments launchArguments =
+ getSystemAccessibilitySettingsLaunchArguments(componentName);
+ if (launchArguments == null) {
+ return false;
+ }
+ openSubSettings(launchArguments.mDestination, launchArguments.mArguments);
+ finish();
+ return true;
+ }
+
+ @Nullable
+ private LaunchFragmentArguments getSystemAccessibilitySettingsLaunchArguments(
+ @Nullable ComponentName componentName) {
+ if (MAGNIFICATION_COMPONENT_NAME.equals(componentName)) {
+ final String destination = ToggleScreenMagnificationPreferenceFragment.class.getName();
+ final Bundle arguments = new Bundle();
+ MagnificationGesturesPreferenceController.populateMagnificationGesturesPreferenceExtras(
+ arguments, getContext());
+ return new LaunchFragmentArguments(destination, arguments);
+ }
+ return null;
+ }
+
+
+ private void openAccessibilitySettingsAndFinish() {
+ openSubSettings(AccessibilitySettings.class.getName(), /* arguments= */ null);
+ finish();
+ }
+
+ private boolean openAccessibilityDetailsSettingsAndFinish(
+ @Nullable ComponentName componentName) {
+ // In case the A11yServiceInfo doesn't exist, go to ally services list.
final AccessibilityServiceInfo info = getAccessibilityServiceInfo(componentName);
if (info == null) {
- Log.w(TAG, "Open accessibility services list due to invalid component name.");
- openAccessibilitySettingsAndFinish();
- return;
+ Log.w(TAG, "openAccessibilityDetailsSettingsAndFinish : invalid component name.");
+ return false;
}
// In case this accessibility service isn't permitted, go to a11y services list.
if (!isServiceAllowed(componentName.getPackageName())) {
Log.w(TAG,
- "Open accessibility services list due to target accessibility service is "
+ "openAccessibilityDetailsSettingsAndFinish: target accessibility service is"
+ "prohibited by Device Admin.");
- openAccessibilitySettingsAndFinish();
- return;
+ return false;
}
-
- openAccessibilityDetailsSettingsAndFinish(buildArguments(info));
- }
-
- @VisibleForTesting
- void openAccessibilitySettingsAndFinish() {
- new SubSettingLauncher(getActivity())
- .setDestination(AccessibilitySettings.class.getName())
- .setSourceMetricsCategory(getMetricsCategory())
- .launch();
+ openSubSettings(ToggleAccessibilityServicePreferenceFragment.class.getName(),
+ buildArguments(info));
finish();
+ return true;
}
- @VisibleForTesting
- void openAccessibilityDetailsSettingsAndFinish(Bundle arguments) {
+ private void openSubSettings(@NonNull String destination, @Nullable Bundle arguments) {
new SubSettingLauncher(getActivity())
- .setDestination(ToggleAccessibilityServicePreferenceFragment.class.getName())
+ .setDestination(destination)
.setSourceMetricsCategory(getMetricsCategory())
.setArguments(arguments)
.launch();
- finish();
}
@VisibleForTesting
@@ -175,4 +214,13 @@
}
activity.finish();
}
+
+ private static class LaunchFragmentArguments {
+ final String mDestination;
+ final Bundle mArguments;
+ LaunchFragmentArguments(@NonNull String destination, @Nullable Bundle arguments) {
+ mDestination = Objects.requireNonNull(destination);
+ mArguments = arguments;
+ }
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 1a6c8e8..2b9ca48 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import android.content.ComponentName;
+import android.content.res.Resources;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
@@ -122,4 +123,11 @@
finish();
}
}
+
+ @Override
+ protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ theme.applyStyle(R.style.SetupWizardPartnerResource, true);
+ super.onApplyThemeResource(theme, new_resid, first);
+ }
}
diff --git a/src/com/android/settings/accessibility/ForceBoldTextPreferenceController.java b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
similarity index 70%
rename from src/com/android/settings/accessibility/ForceBoldTextPreferenceController.java
rename to src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
index c8a3203..97f96a4 100644
--- a/src/com/android/settings/accessibility/ForceBoldTextPreferenceController.java
+++ b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
@@ -17,15 +17,17 @@
package com.android.settings.accessibility;
import android.content.Context;
-import android.content.res.Configuration;
+import android.graphics.fonts.FontStyle;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;
/** PreferenceController for displaying all text in bold. */
-public class ForceBoldTextPreferenceController extends TogglePreferenceController {
+public class FontWeightAdjustmentPreferenceController extends TogglePreferenceController {
+ static final int BOLD_TEXT_ADJUSTMENT =
+ FontStyle.FONT_WEIGHT_BOLD - FontStyle.FONT_WEIGHT_NORMAL;
- public ForceBoldTextPreferenceController(Context context, String preferenceKey) {
+ public FontWeightAdjustmentPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -37,14 +39,12 @@
@Override
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT, Configuration.FORCE_BOLD_TEXT_NO)
- == Configuration.FORCE_BOLD_TEXT_YES;
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, 0) == BOLD_TEXT_ADJUSTMENT;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT,
- (isChecked ? Configuration.FORCE_BOLD_TEXT_YES : Configuration.FORCE_BOLD_TEXT_NO));
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));
}
}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index c0de313..04491cc 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -313,12 +313,6 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
- mUserShortcutTypesCache = mShortcutPreference.isChecked()
- ? retrieveUserShortcutType(getPrefContext(), mComponentName.flattenToString(),
- UserShortcutType.SOFTWARE)
- : UserShortcutType.EMPTY;
-
final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
|| mToggleServiceDividerSwitchPreference.isChecked();
showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 678ef13..0f4b762 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -16,11 +16,6 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
-import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
-import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
-
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -92,8 +87,7 @@
protected static final String KEY_GENERAL_CATEGORY = "general_categories";
protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
- @VisibleForTesting
- static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+ protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
private SettingsContentObserver mSettingsContentObserver;
@@ -101,9 +95,9 @@
private CheckBox mSoftwareTypeCheckBox;
private CheckBox mHardwareTypeCheckBox;
- // Used to restore the edit dialog status.
- protected int mUserShortcutTypesCache = UserShortcutType.EMPTY;
- protected int mUserShortcutTypes = UserShortcutType.EMPTY;
+ public static final int NOT_SET = -1;
+ // Save user's shortcutType value when savedInstance has value (e.g. device rotated).
+ protected int mSavedCheckBoxValue = NOT_SET;
// For html description of accessibility service, must follow the rule, such as
// <img src="R.drawable.fileName"/>, a11y settings will get the resources successfully.
@@ -125,10 +119,11 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
// Restore the user shortcut type.
- if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
- mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
- UserShortcutType.EMPTY);
+ if (savedInstanceState != null && savedInstanceState.containsKey(
+ KEY_SAVED_USER_SHORTCUT_TYPE)) {
+ mSavedCheckBoxValue = savedInstanceState.getInt(KEY_SAVED_USER_SHORTCUT_TYPE, NOT_SET);
}
setupDefaultShortcutIfNecessary(getPrefContext());
@@ -188,6 +183,7 @@
@Override
public void onResume() {
super.onResume();
+
final AccessibilityManager am = getPrefContext().getSystemService(
AccessibilityManager.class);
am.addTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
@@ -207,7 +203,10 @@
@Override
public void onSaveInstanceState(Bundle outState) {
- outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
+ final int value = getShortcutTypeCheckBoxValue();
+ if (value != NOT_SET) {
+ outState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, value);
+ }
super.onSaveInstanceState(outState);
}
@@ -220,7 +219,7 @@
R.string.accessibility_shortcut_title, mPackageName);
dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);
- initializeDialogCheckBox(dialog);
+ setupEditShortcutDialog(dialog);
return dialog;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
dialog = AccessibilityGestureNavigationTutorial
@@ -379,8 +378,8 @@
mImageGetterCacheView.setImageURI(null);
final int imageWidth = drawable.getIntrinsicWidth();
final int imageHeight = drawable.getIntrinsicHeight();
- final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
- if ((imageWidth > getScreenWidthPixels(getPrefContext()))
+ final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
+ if ((imageWidth > AccessibilityUtil.getScreenWidthPixels(getPrefContext()))
|| (imageHeight > screenHalfHeight)) {
return null;
}
@@ -396,7 +395,7 @@
return;
}
- final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
+ final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
final AnimatedImagePreference animatedImagePreference =
new AnimatedImagePreference(getPrefContext());
animatedImagePreference.setImageUri(mImageUri);
@@ -425,6 +424,20 @@
getPreferenceScreen().addPreference(generalCategory);
}
+ protected void initShortcutPreference() {
+ // Initial the shortcut preference.
+ mShortcutPreference = new ShortcutPreference(getPrefContext(), /* attrs= */ null);
+ mShortcutPreference.setPersistent(false);
+ mShortcutPreference.setKey(getShortcutPreferenceKey());
+ mShortcutPreference.setOnClickCallback(this);
+
+ final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
+ mShortcutPreference.setTitle(title);
+
+ final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+ generalCategory.addPreference(mShortcutPreference);
+ }
+
protected void initSettingsPreference() {
if (mSettingsTitle == null || mSettingsIntent == null) {
return;
@@ -478,16 +491,8 @@
}
}
- private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
- final View dialogTextArea = dialogView.findViewById(R.id.container);
- dialogTextArea.setOnClickListener(v -> {
- checkBox.toggle();
- updateUserShortcutType(/* saveChanges= */ false);
- });
- }
-
@VisibleForTesting
- void initializeDialogCheckBox(Dialog dialog) {
+ void setupEditShortcutDialog(Dialog dialog) {
final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -496,39 +501,58 @@
mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
- updateAlertDialogCheckState();
+ updateEditShortcutDialogCheckBox();
}
- private void updateAlertDialogCheckState() {
- if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
- updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
- updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
+ private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+ final View dialogTextArea = dialogView.findViewById(R.id.container);
+ dialogTextArea.setOnClickListener(v -> checkBox.toggle());
+ }
+
+ private void updateEditShortcutDialogCheckBox() {
+ // If it is during onConfigChanged process then restore the value, or get the saved value
+ // when shortcutPreference is checked.
+ int value = restoreOnConfigChangedValue();
+ if (value == NOT_SET) {
+ final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+ getPrefContext(), mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+ value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+ : UserShortcutType.EMPTY;
}
+
+ mSoftwareTypeCheckBox.setChecked(
+ hasShortcutType(value, UserShortcutType.SOFTWARE));
+ mHardwareTypeCheckBox.setChecked(
+ hasShortcutType(value, UserShortcutType.HARDWARE));
}
- private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
- checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+ private int restoreOnConfigChangedValue() {
+ final int savedValue = mSavedCheckBoxValue;
+ mSavedCheckBoxValue = NOT_SET;
+ return savedValue;
}
- @VisibleForTesting
- void updateUserShortcutType(boolean saveChanges) {
- mUserShortcutTypesCache = UserShortcutType.EMPTY;
+ private boolean hasShortcutType(int value, @UserShortcutType int type) {
+ return (value & type) == type;
+ }
+
+ /**
+ * Returns accumulated {@link UserShortcutType} checkbox value or {@code NOT_SET} if checkboxes
+ * did not exist.
+ */
+ protected int getShortcutTypeCheckBoxValue() {
+ if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+ return NOT_SET;
+ }
+
+ int value = UserShortcutType.EMPTY;
if (mSoftwareTypeCheckBox.isChecked()) {
- mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
+ value |= UserShortcutType.SOFTWARE;
}
if (mHardwareTypeCheckBox.isChecked()) {
- mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
+ value |= UserShortcutType.HARDWARE;
}
-
- if (saveChanges) {
- final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
- if (isChanged) {
- final PreferredShortcut shortcut = new PreferredShortcut(
- mComponentName.flattenToString(), mUserShortcutTypesCache);
- saveUserShortcutType(getPrefContext(), shortcut);
- }
- mUserShortcutTypes = mUserShortcutTypesCache;
- }
+ return value;
}
protected CharSequence getShortcutTypeSummary(Context context) {
@@ -540,7 +564,7 @@
return context.getText(R.string.switch_off_text);
}
- final int shortcutTypes = retrieveUserShortcutType(context,
+ final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
int resId = R.string.accessibility_shortcut_edit_summary_software;
if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
@@ -581,14 +605,13 @@
return;
}
- updateUserShortcutType(/* saveChanges= */ true);
- AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), mUserShortcutTypes,
- mComponentName);
- AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~mUserShortcutTypes,
- mComponentName);
- mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
- mShortcutPreference.setSummary(
- getShortcutTypeSummary(getPrefContext()));
+ final int value = getShortcutTypeCheckBoxValue();
+
+ saveNonEmptyUserShortcutType(value);
+ AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), value, mComponentName);
+ AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~value, mComponentName);
+ mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
+ mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
}
protected void updateShortcutPreferenceData() {
@@ -596,40 +619,21 @@
return;
}
- // Get the user shortcut type from settings provider.
- mUserShortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
- mComponentName);
- if (mUserShortcutTypes != UserShortcutType.EMPTY) {
+ final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(
+ getPrefContext(), mComponentName);
+ if (shortcutTypes != UserShortcutType.EMPTY) {
final PreferredShortcut shortcut = new PreferredShortcut(
- mComponentName.flattenToString(), mUserShortcutTypes);
- saveUserShortcutType(getPrefContext(), shortcut);
- } else {
- // Get the user shortcut type from shared_prefs if cannot get from settings provider.
- mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
- mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+ mComponentName.flattenToString(), shortcutTypes);
+ PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
}
}
- protected void initShortcutPreference() {
- // Initial the shortcut preference.
- mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
- mShortcutPreference.setPersistent(false);
- mShortcutPreference.setKey(getShortcutPreferenceKey());
- mShortcutPreference.setOnClickCallback(this);
-
- final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
- mShortcutPreference.setTitle(title);
-
- final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
- generalCategory.addPreference(mShortcutPreference);
- }
-
protected void updateShortcutPreference() {
if (mComponentName == null) {
return;
}
- final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+ final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
mShortcutPreference.setChecked(
AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
@@ -647,7 +651,7 @@
return;
}
- final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+ final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
if (preference.isChecked()) {
AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
@@ -662,11 +666,6 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
- mUserShortcutTypesCache = mShortcutPreference.isChecked()
- ? retrieveUserShortcutType(getPrefContext(),
- mComponentName.flattenToString(), UserShortcutType.SOFTWARE)
- : UserShortcutType.EMPTY;
showDialog(DialogEnums.EDIT_SHORTCUT);
}
@@ -703,4 +702,15 @@
shortcutName.flattenToString());
}
}
+
+ @VisibleForTesting
+ void saveNonEmptyUserShortcutType(int type) {
+ if (type == UserShortcutType.EMPTY) {
+ return;
+ }
+
+ final PreferredShortcut shortcut = new PreferredShortcut(
+ mComponentName.flattenToString(), type);
+ PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+ }
}
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index 84133f3..5562795 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -91,8 +91,8 @@
final List<String> lists = new ArrayList<>();
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_INTENSITY);
- lists.add(KEY_PERSIST);
lists.add(KEY_GENERAL_CATEGORY);
+ lists.add(KEY_PERSIST);
lists.add(KEY_INTRODUCTION_CATEGORY);
return lists;
}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index d470bef..8e14e5a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -19,8 +19,6 @@
import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
-import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
@@ -58,17 +56,13 @@
*/
public class ToggleScreenMagnificationPreferenceFragment extends
ToggleFeaturePreferenceFragment {
-
- private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+ // TODO(b/147021230): Move duplicated functions with android/internal/accessibility into util.
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
private CheckBox mSoftwareTypeCheckBox;
private CheckBox mHardwareTypeCheckBox;
private CheckBox mTripleTapTypeCheckBox;
- // TODO(b/147021230): Will move common functions and variables to
- // android/internal/accessibility folder. For now, magnification need to be treated
- // individually.
private static final char COMPONENT_NAME_SEPARATOR = ':';
private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
@@ -95,12 +89,6 @@
}
@Override
- public void onSaveInstanceState(Bundle outState) {
- outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
- super.onSaveInstanceState(outState);
- }
-
- @Override
public void onResume() {
super.onResume();
@@ -131,21 +119,13 @@
dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
getPrefContext(), dialogTitle,
this::callOnAlertDialogCheckboxClicked);
- initializeDialogCheckBox(dialog);
+ setupMagnificationEditShortcutDialog(dialog);
return dialog;
default:
return super.onCreateDialog(dialogId);
}
}
- private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
- final View dialogTextArea = dialogView.findViewById(R.id.container);
- dialogTextArea.setOnClickListener(v -> {
- checkBox.toggle();
- updateUserShortcutType(/* saveChanges= */ false);
- });
- }
-
@Override
protected void initSettingsPreference() {
mSettingsPreference = new Preference(getPrefContext());
@@ -157,8 +137,27 @@
generalCategory.addPreference(mSettingsPreference);
}
+ @Override
+ protected int getShortcutTypeCheckBoxValue() {
+ if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+ return NOT_SET;
+ }
+
+ int value = UserShortcutType.EMPTY;
+ if (mSoftwareTypeCheckBox.isChecked()) {
+ value |= UserShortcutType.SOFTWARE;
+ }
+ if (mHardwareTypeCheckBox.isChecked()) {
+ value |= UserShortcutType.HARDWARE;
+ }
+ if (mTripleTapTypeCheckBox.isChecked()) {
+ value |= UserShortcutType.TRIPLETAP;
+ }
+ return value;
+ }
+
@VisibleForTesting
- void initializeDialogCheckBox(AlertDialog dialog) {
+ void setupMagnificationEditShortcutDialog(AlertDialog dialog) {
final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -172,49 +171,46 @@
setDialogTextAreaClickListener(dialogTripleTapView, mTripleTapTypeCheckBox);
final View advancedView = dialog.findViewById(R.id.advanced_shortcut);
- updateAlertDialogCheckState();
-
- // Shows the triple tap checkbox directly if clicked.
if (mTripleTapTypeCheckBox.isChecked()) {
advancedView.setVisibility(View.GONE);
dialogTripleTapView.setVisibility(View.VISIBLE);
}
+
+ updateMagnificationEditShortcutDialogCheckBox();
}
- private void updateAlertDialogCheckState() {
- if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
- updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
- updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
- updateCheckStatus(mTripleTapTypeCheckBox, UserShortcutType.TRIPLETAP);
- }
+ private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+ final View dialogTextArea = dialogView.findViewById(R.id.container);
+ dialogTextArea.setOnClickListener(v -> checkBox.toggle());
}
- private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
- checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+ private void updateMagnificationEditShortcutDialogCheckBox() {
+ // If it is during onConfigChanged process then restore the value, or get the saved value
+ // when shortcutPreference is checked.
+ int value = restoreOnConfigChangedValue();
+ if (value == NOT_SET) {
+ final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+ getPrefContext(), MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+ value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+ : UserShortcutType.EMPTY;
+ }
+
+ mSoftwareTypeCheckBox.setChecked(
+ hasShortcutType(value, UserShortcutType.SOFTWARE));
+ mHardwareTypeCheckBox.setChecked(
+ hasShortcutType(value, UserShortcutType.HARDWARE));
+ mTripleTapTypeCheckBox.setChecked(
+ hasShortcutType(value, UserShortcutType.TRIPLETAP));
}
- @VisibleForTesting
- void updateUserShortcutType(boolean saveChanges) {
- mUserShortcutTypesCache = UserShortcutType.EMPTY;
- if (mSoftwareTypeCheckBox.isChecked()) {
- mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
- }
- if (mHardwareTypeCheckBox.isChecked()) {
- mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
- }
- if (mTripleTapTypeCheckBox.isChecked()) {
- mUserShortcutTypesCache |= UserShortcutType.TRIPLETAP;
- }
+ private int restoreOnConfigChangedValue() {
+ final int savedValue = mSavedCheckBoxValue;
+ mSavedCheckBoxValue = NOT_SET;
+ return savedValue;
+ }
- if (saveChanges) {
- final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
- if (isChanged) {
- final PreferredShortcut shortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypesCache);
- saveUserShortcutType(getPrefContext(), shortcut);
- }
- mUserShortcutTypes = mUserShortcutTypesCache;
- }
+ private boolean hasShortcutType(int value, @UserShortcutType int type) {
+ return (value & type) == type;
}
@Override
@@ -223,8 +219,8 @@
return context.getText(R.string.switch_off_text);
}
- final int shortcutType = retrieveUserShortcutType(context, MAGNIFICATION_CONTROLLER_NAME,
- UserShortcutType.EMPTY);
+ final int shortcutType = PreferredShortcuts.retrieveUserShortcutType(context,
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
int resId = R.string.accessibility_shortcut_edit_summary_software;
if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -261,10 +257,12 @@
@Override
protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
- updateUserShortcutType(/* saveChanges= */ true);
- optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutTypes);
- optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutTypes);
- mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
+ final int value = getShortcutTypeCheckBoxValue();
+
+ saveNonEmptyUserShortcutType(value);
+ optInAllMagnificationValuesToSettings(getPrefContext(), value);
+ optOutAllMagnificationValuesFromSettings(getPrefContext(), ~value);
+ mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
mShortcutPreference.setSummary(
getShortcutTypeSummary(getPrefContext()));
}
@@ -312,7 +310,7 @@
@Override
public void onToggleClicked(ShortcutPreference preference) {
- final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+ final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
if (preference.isChecked()) {
optInAllMagnificationValuesToSettings(getPrefContext(), shortcutTypes);
@@ -325,26 +323,16 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
- mUserShortcutTypesCache = mShortcutPreference.isChecked()
- ? retrieveUserShortcutType(getPrefContext(),
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE)
- : UserShortcutType.EMPTY;
showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
}
@Override
protected void updateShortcutPreferenceData() {
- // Get the user shortcut type from settings provider.
- mUserShortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
- if (mUserShortcutTypes != UserShortcutType.EMPTY) {
+ final int shortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
+ if (shortcutTypes != UserShortcutType.EMPTY) {
final PreferredShortcut shortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypes);
- saveUserShortcutType(getPrefContext(), shortcut);
- } else {
- // Get the user shortcut type from shared_prefs if cannot get from settings provider.
- mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+ MAGNIFICATION_CONTROLLER_NAME, shortcutTypes);
+ PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
}
}
@@ -365,7 +353,7 @@
@Override
protected void updateShortcutPreference() {
- final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+ final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
mShortcutPreference.setChecked(
hasMagnificationValuesInSettings(getPrefContext(), shortcutTypes));
@@ -373,6 +361,17 @@
}
@VisibleForTesting
+ void saveNonEmptyUserShortcutType(int type) {
+ if (type == UserShortcutType.EMPTY) {
+ return;
+ }
+
+ final PreferredShortcut shortcut = new PreferredShortcut(
+ MAGNIFICATION_CONTROLLER_NAME, type);
+ PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+ }
+
+ @VisibleForTesting
static void optInAllMagnificationValuesToSettings(Context context, int shortcutTypes) {
if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
optInMagnificationValueToSettings(context, UserShortcutType.SOFTWARE);
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 8b0f851..84e7bf7 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -21,12 +21,14 @@
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
import android.view.View;
import androidx.annotation.NonNull;
import com.android.settings.R;
import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -65,6 +67,10 @@
@Override
protected int getPreferenceScreenResId() {
+ // TODO(b/168166015): Remove this when the new Apps page ready.
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+ return R.xml.apps;
+ }
return R.xml.app_and_notification;
}
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
index 7e7710b..0f88811 100644
--- a/src/com/android/settings/backup/OWNERS
+++ b/src/com/android/settings/backup/OWNERS
@@ -1,4 +1,4 @@
# Bug component: 656484
-include platform/frameworks/base/services/backup:/OWNERS
+include platform/frameworks/base:/services/backup/OWNERS
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 791efa7..4822607 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -203,9 +203,9 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
theme.applyStyle(R.style.SetupWizardPartnerResource, true);
- super.onApplyThemeResource(theme, resid, first);
+ super.onApplyThemeResource(theme, new_resid, first);
}
@Override
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 1d9d07b..7936f66 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -116,9 +116,9 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
theme.applyStyle(R.style.SetupWizardPartnerResource, true);
- super.onApplyThemeResource(theme, resid, first);
+ super.onApplyThemeResource(theme, new_resid, first);
}
@Override
diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
index 78a29b3..1ea6b08 100644
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -80,7 +80,7 @@
mActivity.getIntent());
fpIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle);
final PendingIntent fpAfterFaceIntent = PendingIntent.getActivity(mActivity,
- 0 /* requestCode */, fpIntent, 0 /* flags */);
+ 0 /* requestCode */, fpIntent, PendingIntent.FLAG_IMMUTABLE);
faceIntent.putExtra(EXTRA_ENROLL_AFTER_FACE, fpAfterFaceIntent);
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index b91bb79..99e9d50 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager;
+import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
@@ -40,6 +41,9 @@
public class UsbDetailsFunctionsController extends UsbDetailsController
implements RadioButtonPreference.OnClickListener {
+ private static final String TAG = "UsbFunctionsCtrl";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
static final Map<Long, Integer> FUNCTIONS_MAP = new LinkedHashMap<>();
static {
@@ -88,6 +92,10 @@
@Override
protected void refresh(boolean connected, long functions, int powerRole, int dataRole) {
+ if (DEBUG) {
+ Log.d(TAG, "refresh() connected : " + connected + ", functions : " + functions
+ + ", powerRole : " + powerRole + ", dataRole : " + dataRole);
+ }
if (!connected || dataRole != DATA_ROLE_DEVICE) {
mProfilesContainer.setEnabled(false);
} else {
@@ -100,7 +108,7 @@
pref = getProfilePreference(UsbBackend.usbFunctionsToString(option), title);
// Only show supported options
if (mUsbBackend.areFunctionsSupported(option)) {
- if (functions == UsbManager.FUNCTION_ACCESSORY) {
+ if (isAccessoryMode(functions)) {
pref.setChecked(UsbManager.FUNCTION_MTP == option);
} else {
pref.setChecked(functions == option);
@@ -115,6 +123,12 @@
public void onRadioButtonClicked(RadioButtonPreference preference) {
final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
final long previousFunction = mUsbBackend.getCurrentFunctions();
+ if (DEBUG) {
+ Log.d(TAG, "onRadioButtonClicked() function : " + function + ", toString() : "
+ + UsbManager.usbFunctionsToString(function) + ", previousFunction : "
+ + previousFunction + ", toString() : "
+ + UsbManager.usbFunctionsToString(previousFunction));
+ }
if (function != previousFunction && !Utils.isMonkeyRunning()
&& !shouldIgnoreClickEvent(function, previousFunction)) {
mPreviousFunction = previousFunction;
@@ -140,8 +154,11 @@
}
private boolean shouldIgnoreClickEvent(long function, long previousFunction) {
- return previousFunction == UsbManager.FUNCTION_ACCESSORY
- && function == UsbManager.FUNCTION_MTP;
+ return isAccessoryMode(previousFunction) && function == UsbManager.FUNCTION_MTP;
+ }
+
+ private boolean isAccessoryMode(long function) {
+ return (function & UsbManager.FUNCTION_ACCESSORY) != 0;
}
@Override
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 7f1a0d8..f72a006 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -39,6 +39,7 @@
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
@@ -140,6 +141,17 @@
mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
mChart = findPreference(KEY_CHART_DATA);
mApps = findPreference(KEY_APPS_GROUP);
+
+ // TODO(b/167474581): This is a temporary solution to hide unnecessary warning
+ // preference, when the provider model is completed, the following code should be removed.
+ final Preference unnecessaryWarningPreference =
+ FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)
+ ? findPreference("operator_warning")
+ : findPreference("non_carrier_data_usage_warning");
+ if (unnecessaryWarningPreference != null) {
+ unnecessaryWarningPreference.setVisible(false);
+ }
+
processArgument();
mDataStateListener = new MobileDataEnabledListener(activity, this);
}
diff --git a/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
similarity index 99%
rename from src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java
rename to src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index a16c9bb..bbfbb19 100644
--- a/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
diff --git a/src/com/android/settings/location/TimeZoneDetectionSettings.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
similarity index 96%
rename from src/com/android/settings/location/TimeZoneDetectionSettings.java
rename to src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
index 66e2f9a..db6ffc4 100644
--- a/src/com/android/settings/location/TimeZoneDetectionSettings.java
+++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime.locationtimezone;
import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
similarity index 96%
rename from src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java
rename to src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
index f23c9f9..c91be7f 100644
--- a/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java
+++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime.locationtimezone;
import android.app.time.TimeManager;
import android.app.time.TimeZoneCapabilitiesAndConfig;
diff --git a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
new file mode 100644
index 0000000..b11bb58
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller for the "Enable transcode for all apps" switch on the transcode settings
+ * screen.
+ */
+public class TranscodeGlobalTogglePreferenceController extends TogglePreferenceController {
+
+ private static final String TRANSCODE_ENABLED_PROP_KEY = "persist.sys.fuse.transcode";
+
+ public TranscodeGlobalTogglePreferenceController(Context context,
+ String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, false);
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, String.valueOf(isChecked));
+ return true;
+ }
+}
diff --git a/src/com/android/settings/location/TimeZoneDetectionSettings.java b/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
similarity index 60%
copy from src/com/android/settings/location/TimeZoneDetectionSettings.java
copy to src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
index 66e2f9a..e3dc9bf 100644
--- a/src/com/android/settings/location/TimeZoneDetectionSettings.java
+++ b/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
@@ -13,40 +13,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.location;
+
+package com.android.settings.development.transcode;
import android.app.settings.SettingsEnums;
+import android.content.Context;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
/**
- * The controller for the "location time zone detection" screen.
+ * Fragment for native transcode settings in Developer options.
*/
-@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class TimeZoneDetectionSettings extends DashboardFragment {
- private static final String TAG = "LTZDetectionSettings";
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.LOCATION_TIME_ZONE_DETECTION;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.location_time_zone_detection;
- }
+@SearchIndexable
+public class TranscodeSettingsFragment extends DashboardFragment {
+ private static final String TAG = "TranscodeSettings";
@Override
protected String getLogTag() {
return TAG;
}
- /**
- * For Search.
- */
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.transcode_settings;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.TRANSCODE_SETTINGS;
+ }
+
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.location_time_zone_detection);
+ new BaseSearchIndexProvider(R.xml.transcode_settings) {
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+ }
+ };
}
diff --git a/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceController.java
new file mode 100644
index 0000000..defe821
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceController.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * The controller for the "Skip transcoding for apps" section on the transcode settings
+ * screen.
+ */
+public class TranscodeSkipAppsPreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private static final String SKIP_SELECTED_APPS_PROP_KEY =
+ "persist.sys.fuse.transcode_skip_uids";
+
+ private final PackageManager mPackageManager;
+ private final List<String> mUidsToSkip = new ArrayList<>();
+
+ public TranscodeSkipAppsPreferenceController(Context context,
+ String preferenceKey) {
+ super(context, preferenceKey);
+ mPackageManager = context.getPackageManager();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final Context context = screen.getContext();
+ mUidsToSkip.addAll(Arrays.asList(
+ SystemProperties.get(SKIP_SELECTED_APPS_PROP_KEY).split(",")));
+ Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+ launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ List<ResolveInfo> apps = mPackageManager.queryIntentActivities(launcherIntent, 0);
+ for (ResolveInfo app : apps) {
+ String uid = String.valueOf(app.activityInfo.applicationInfo.uid);
+ SwitchPreference preference = new SwitchPreference(context);
+ preference.setTitle(app.loadLabel(mPackageManager));
+ preference.setIcon(app.loadIcon(mPackageManager));
+ preference.setKey(uid);
+ preference.setChecked(isSkippedForTranscoding(uid));
+ preference.setOnPreferenceChangeListener(this);
+
+ screen.addPreference(preference);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object o) {
+ boolean value = (Boolean) o;
+ String uidStr = preference.getKey();
+ if (value) {
+ mUidsToSkip.add(uidStr);
+ } else {
+ mUidsToSkip.remove(uidStr);
+ }
+ SystemProperties.set(SKIP_SELECTED_APPS_PROP_KEY, String.join(",", mUidsToSkip));
+ return true;
+ }
+
+ private boolean isSkippedForTranscoding(String uid) {
+ return mUidsToSkip.contains(uid);
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 9858ad2..10409fc 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -140,6 +140,7 @@
private SubscriptionInfo mSubscriptionInfo;
private TelephonyDisplayInfo mTelephonyDisplayInfo;
+ private ServiceState mPreviousServiceState;
private final int mSlotIndex;
private TelephonyManager mTelephonyManager;
@@ -437,6 +438,9 @@
final int state = Utils.getCombinedServiceState(serviceState);
if (!Utils.isInService(serviceState)) {
resetSignalStrength();
+ } else if (!Utils.isInService(mPreviousServiceState)) {
+ // If ServiceState changed from out of service -> in service, update signal strength.
+ updateSignalStrength(mTelephonyManager.getSignalStrength());
}
String serviceStateValue;
@@ -484,7 +488,7 @@
}
ServiceState serviceState = mTelephonyManager.getServiceState();
- if (serviceState == null || !Utils.isInService(serviceState)) {
+ if (!Utils.isInService(serviceState)) {
return;
}
@@ -767,6 +771,7 @@
updateNetworkProvider();
updateServiceState(serviceState);
updateRoamingStatus(serviceState);
+ mPreviousServiceState = serviceState;
}
@Override
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 6dee5d2..7749c8f 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -16,12 +16,17 @@
package com.android.settings.display;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.PowerManager;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
@@ -31,13 +36,9 @@
private static final int MY_USER = UserHandle.myUserId();
private static final String PROP_AWARE_AVAILABLE = "ro.vendor.aware_available";
+ private static final String AOD_SUPPRESSED_TOKEN = "winddown";
private AmbientDisplayConfiguration mConfig;
- private OnPreferenceChangedCallback mCallback;
-
- public interface OnPreferenceChangedCallback {
- void onPreferenceChanged();
- }
public AmbientDisplayAlwaysOnPreferenceController(Context context, String key) {
super(context, key);
@@ -51,6 +52,12 @@
}
@Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ refreshSummary(preference);
+ }
+
+ @Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
}
@@ -70,24 +77,22 @@
int enabled = isChecked ? ON : OFF;
Settings.Secure.putInt(
mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
- if (mCallback != null) {
- mCallback.onPreferenceChanged();
- }
return true;
}
+ @Override
+ public CharSequence getSummary() {
+ return mContext.getText(
+ isAodSuppressedByBedtime(mContext) ? R.string.aware_summary_when_bedtime_on
+ : R.string.doze_always_on_summary);
+ }
+
public AmbientDisplayAlwaysOnPreferenceController setConfig(
AmbientDisplayConfiguration config) {
mConfig = config;
return this;
}
- public AmbientDisplayAlwaysOnPreferenceController setCallback(
- OnPreferenceChangedCallback callback) {
- mCallback = callback;
- return this;
- }
-
public static boolean isAvailable(AmbientDisplayConfiguration config) {
return config.alwaysOnAvailableForUser(MY_USER);
}
@@ -98,4 +103,25 @@
}
return mConfig;
}
+
+ /**
+ * Returns whether AOD is suppressed by Bedtime mode, a feature of Digital Wellbeing.
+ *
+ * We know that Bedtime mode suppresses AOD using {@link AOD_SUPPRESSED_TOKEN}. If the Digital
+ * Wellbeing app is suppressing AOD with {@link AOD_SUPPRESSED_TOKEN}, then we can infer that
+ * AOD is being suppressed by Bedtime mode.
+ */
+ public static boolean isAodSuppressedByBedtime(Context context) {
+ int uid;
+ final PowerManager powerManager = context.getSystemService(PowerManager.class);
+ final PackageManager packageManager = context.getPackageManager();
+ final String packageName = context.getString(
+ com.android.internal.R.string.config_defaultWellbeingPackage);
+ try {
+ uid = packageManager.getApplicationInfo(packageName, /* flags= */ 0).uid;
+ } catch (PackageManager.NameNotFoundException e) {
+ return false;
+ }
+ return powerManager.isAmbientDisplaySuppressedForTokenByApp(AOD_SUPPRESSED_TOKEN, uid);
+ }
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index ed06cce..309811d 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -124,7 +124,7 @@
throws StatsManager.StatsUnavailableException {
final Intent extraIntent = new Intent(context, AnomalyDetectionReceiver.class);
final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, REQUEST_CODE,
- extraIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ extraIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
statsManager.setBroadcastSubscriber(pendingIntent,
StatsManagerConfig.ANOMALY_CONFIG_KEY, StatsManagerConfig.SUBSCRIBER_ID);
}
diff --git a/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
new file mode 100644
index 0000000..278fa3a
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for emergency gesture setting's entyrpoint preference
+ */
+public class EmergencyGestureEntrypointPreferenceController extends BasePreferenceController {
+ private static final String TAG = "EmergencyGestureEntry";
+
+ @VisibleForTesting
+ static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
+ "com.android.settings.action.emergency_gesture_settings";
+ @VisibleForTesting
+ Intent mIntent;
+
+ private boolean mUseCustomIntent;
+
+ public EmergencyGestureEntrypointPreferenceController(Context context, String key) {
+ super(context, key);
+ final String emergencyGestureSettingsPackageName = context.getResources().getString(
+ R.string.emergency_gesture_settings_package);
+ if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
+ mUseCustomIntent = true;
+ // Use custom intent if it's configured and system can resolve it.
+ final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+ .setPackage(emergencyGestureSettingsPackageName);
+ if (canResolveIntent(intent)) {
+ mIntent = intent;
+ }
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final boolean canHandleClicks = !mUseCustomIntent || mIntent != null;
+ if (preference != null) {
+ preference.setEnabled(canHandleClicks);
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mIntent != null) {
+ mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ mContext.startActivity(mIntent);
+ return true;
+ }
+ return super.handlePreferenceTreeClick(preference);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final boolean isConfigEnabled = mContext.getResources()
+ .getBoolean(R.bool.config_show_emergency_gesture_settings);
+
+ if (!isConfigEnabled) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ if (mUseCustomIntent) {
+ final String packageName = mContext.getResources().getString(
+ R.string.emergency_gesture_settings_package);
+ try {
+ final PackageManager pm = mContext.getPackageManager();
+ final ApplicationInfo appInfo = pm.getApplicationInfo(
+ packageName, PackageManager.MATCH_DISABLED_COMPONENTS
+ | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
+ return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
+ appInfo.loadLabel(pm));
+ } catch (Exception e) {
+ Log.d(TAG, "Failed to get custom summary, falling back.");
+ return super.getSummary();
+ }
+ }
+
+ return super.getSummary();
+ }
+
+ /**
+ * Whether or not gesture page content should be suppressed from search.
+ */
+ public boolean shouldSuppressFromSearch() {
+ return mUseCustomIntent;
+ }
+
+ private boolean canResolveIntent(Intent intent) {
+ final ResolveInfo resolveActivity = mContext.getPackageManager()
+ .resolveActivity(intent, 0);
+ return resolveActivity != null;
+ }
+}
diff --git a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
index c8ce494..2a393a4 100644
--- a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
@@ -17,64 +17,34 @@
package com.android.settings.gestures;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
+import android.widget.Switch;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.widget.LayoutPreference;
/**
* Preference controller for emergency gesture setting
*/
-public class EmergencyGesturePreferenceController extends GesturePreferenceController {
- private static final String TAG = "EmergencyGesturePref";
+public class EmergencyGesturePreferenceController extends BasePreferenceController implements
+ SwitchBar.OnSwitchChangeListener {
@VisibleForTesting
static final int ON = 1;
@VisibleForTesting
static final int OFF = 0;
- @VisibleForTesting
- static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
- "com.android.settings.action.emergency_gesture_settings";
- @VisibleForTesting
- Intent mIntent;
-
- private boolean mUseCustomIntent;
-
- private static final String PREF_KEY_VIDEO = "emergency_gesture_screen_video";
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
+ private SwitchBar mSwitchBar;
+
public EmergencyGesturePreferenceController(Context context, String key) {
super(context, key);
- final String emergencyGestureSettingsPackageName = context.getResources().getString(
- R.string.emergency_gesture_settings_package);
- if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
- mUseCustomIntent = true;
- // Use custom intent if it's configured and system can resolve it.
- final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
- .setPackage(emergencyGestureSettingsPackageName);
- if (canResolveIntent(intent)) {
- mIntent = intent;
- }
- }
- }
-
- @Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mIntent != null) {
- mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- mContext.startActivity(mIntent);
- return true;
- }
- return super.handlePreferenceTreeClick(preference);
}
@Override
@@ -89,62 +59,24 @@
}
@Override
- public boolean isSliceable() {
- return TextUtils.equals(getPreferenceKey(), "gesture_emergency_button");
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final LayoutPreference pref = screen.findPreference(mPreferenceKey);
+ mSwitchBar = pref.findViewById(R.id.switch_bar);
+ mSwitchBar.setSwitchBarText(R.string.emergency_gesture_screen_title,
+ R.string.emergency_gesture_screen_title);
+ mSwitchBar.addOnSwitchChangeListener(this);
+ mSwitchBar.setChecked(isChecked());
+ mSwitchBar.show();
}
- @Override
- protected boolean canHandleClicks() {
- return !mUseCustomIntent || mIntent != null;
- }
-
- @Override
- public CharSequence getSummary() {
- if (mUseCustomIntent) {
- final String packageName = mContext.getResources().getString(
- R.string.emergency_gesture_settings_package);
- try {
- final PackageManager pm = mContext.getPackageManager();
- final ApplicationInfo appInfo = pm.getApplicationInfo(
- packageName, PackageManager.MATCH_DISABLED_COMPONENTS
- | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
- return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
- appInfo.loadLabel(pm));
- } catch (Exception e) {
- Log.d(TAG, "Failed to get custom summary, falling back.");
- return super.getSummary();
- }
- }
-
- return super.getSummary();
- }
-
- @Override
- protected String getVideoPrefKey() {
- return PREF_KEY_VIDEO;
- }
-
- @Override
+ @VisibleForTesting
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
}
@Override
- public boolean setChecked(boolean isChecked) {
- return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
- isChecked ? ON : OFF);
- }
-
- /**
- * Whether or not gesture page content should be suppressed from search.
- */
- public boolean shouldSuppressFromSearch() {
- return mUseCustomIntent;
- }
-
- private boolean canResolveIntent(Intent intent) {
- final ResolveInfo resolveActivity = mContext.getPackageManager()
- .resolveActivity(intent, 0);
- return resolveActivity != null;
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, isChecked ? ON : OFF);
}
}
diff --git a/src/com/android/settings/gestures/EmergencyGestureSettings.java b/src/com/android/settings/gestures/EmergencyGestureSettings.java
index 19ba690..5eec21c 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSettings.java
+++ b/src/com/android/settings/gestures/EmergencyGestureSettings.java
@@ -51,8 +51,8 @@
new BaseSearchIndexProvider(R.xml.emergency_gesture_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
- final EmergencyGesturePreferenceController controller =
- new EmergencyGesturePreferenceController(context,
+ final EmergencyGestureEntrypointPreferenceController controller =
+ new EmergencyGestureEntrypointPreferenceController(context,
"dummy_emergency_gesture_pref_key");
return !controller.isAvailable()
|| controller.shouldSuppressFromSearch();
diff --git a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
index 43eed0c..1a68ade 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
@@ -22,12 +22,11 @@
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
/**
* Preference controller for emergency sos gesture setting
*/
-public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
+public class EmergencyGestureSoundPreferenceController extends GesturePreferenceController {
@VisibleForTesting
static final int ON = 1;
@@ -40,6 +39,11 @@
super(context, key);
}
+ @Override
+ protected String getVideoPrefKey() {
+ return "emergency_gesture_screen_video";
+ }
+
private static boolean isGestureAvailable(Context context) {
return context.getResources()
.getBoolean(R.bool.config_show_emergency_gesture_settings);
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
deleted file mode 100644
index d03b359..0000000
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.deviceinfo;
-
-import android.app.PendingIntent;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.storage.StorageManager;
-import android.text.format.Formatter;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
-import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBuilderUtils;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-
-public class StorageSlice implements CustomSliceable {
- private static final String TAG = "StorageSlice";
-
- private final Context mContext;
-
- public StorageSlice(Context context) {
- mContext = context;
- }
-
- @Override
- public Uri getUri() {
- return CustomSliceRegistry.STORAGE_SLICE_URI;
- }
-
- @Override
- public Slice getSlice() {
- final IconCompat icon = IconCompat.createWithResource(mContext,
- R.drawable.ic_homepage_storage);
- final String title = mContext.getString(R.string.storage_label);
- final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
- ListBuilder.ICON_IMAGE, title);
- final PrivateStorageInfo info = getPrivateStorageInfo();
- return new ListBuilder(mContext, CustomSliceRegistry.STORAGE_SLICE_URI,
- ListBuilder.INFINITY)
- .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
- .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
- .addRow(new ListBuilder.RowBuilder()
- .setTitle(getStorageUsedText(info))
- .setSubtitle(getStorageSummaryText(info))
- .setPrimaryAction(primaryAction))
- .build();
- }
-
- @Override
- public Intent getIntent() {
- final String screenTitle = mContext.getText(R.string.storage_label).toString();
- return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
- StorageDashboardFragment.class.getName(), "" /* key */, screenTitle,
- SettingsEnums.SLICE)
- .setClassName(mContext.getPackageName(), SubSettings.class.getName())
- .setData(CustomSliceRegistry.STORAGE_SLICE_URI);
- }
-
- private PendingIntent getPrimaryAction() {
- final Intent intent = getIntent();
- return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
- }
-
- @VisibleForTesting
- PrivateStorageInfo getPrivateStorageInfo() {
- final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
- final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(storageManager);
- return PrivateStorageInfo.getPrivateStorageInfo(smvp);
- }
-
- @VisibleForTesting
- CharSequence getStorageUsedText(PrivateStorageInfo info) {
- final long usedBytes = info.totalBytes - info.freeBytes;
- return StorageSummaryDonutPreferenceController.convertUsedBytesToFormattedText(mContext,
- usedBytes);
- }
-
- @VisibleForTesting
- CharSequence getStorageSummaryText(PrivateStorageInfo info) {
- return mContext.getString(R.string.storage_volume_total,
- Formatter.formatShortFileSize(mContext, info.totalBytes));
- }
-
- @Override
- public void onNotifyChange(Intent intent) {
-
- }
-}
diff --git a/src/com/android/settings/network/CarrierConfigChangedReceiver.java b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
new file mode 100644
index 0000000..8a6d47d
--- /dev/null
+++ b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+
+/** A receiver listens to the carrier config changes. */
+public class CarrierConfigChangedReceiver extends BroadcastReceiver {
+ private static final String TAG = "CarrierConfigChangedReceiver";
+ private static final String ACTION_CARRIER_CONFIG_CHANGED =
+ CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED;
+
+ private final CountDownLatch mLatch;
+
+ public CarrierConfigChangedReceiver(CountDownLatch latch) {
+ mLatch = latch;
+ }
+
+ public void registerOn(Context context) {
+ context.registerReceiver(this, new IntentFilter(ACTION_CARRIER_CONFIG_CHANGED));
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (isInitialStickyBroadcast()) {
+ return;
+ }
+
+ if (ACTION_CARRIER_CONFIG_CHANGED.equals(intent.getAction())) {
+ checkSubscriptionIndex(intent);
+ }
+ }
+
+ private void checkSubscriptionIndex(Intent intent) {
+ if (intent.hasExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX)) {
+ int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX, -1);
+ Log.i(TAG, "subId from config changed: " + subId);
+ mLatch.countDown();
+ }
+ }
+}
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
new file mode 100644
index 0000000..c47e61a
--- /dev/null
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * {@code EnableMultiSimSidecar} enables multi SIM on the device. It should only be called for
+ * Android R+. After {@code run} is called, it sets the configuration on modem side to enable
+ * multiple SIMs. Once the configuration is set successfully, it will listen to UICC card changes
+ * until {@code TelMan.EXTRA_ACTIVE_SIM_SUPPORTED_COUNT} matches {@code mNumOfActiveSim} or timeout.
+ */
+public class EnableMultiSimSidecar extends AsyncTaskSidecar<Void, Boolean> {
+
+ // Tags
+ private static final String TAG = "EnableMultiSimSidecar";
+
+ // TODO(b/171846124): Pass timeout value from LPA to Settings
+ private static final long ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
+
+ public static EnableMultiSimSidecar get(FragmentManager fm) {
+ return SidecarFragment.get(fm, TAG, EnableMultiSimSidecar.class, null /* args */);
+ }
+
+ final CountDownLatch mSimCardStateChangedLatch = new CountDownLatch(1);
+ private TelephonyManager mTelephonyManager;
+ private int mNumOfActiveSim = 0;
+
+ private final BroadcastReceiver mCarrierConfigChangeReceiver =
+ new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ int readySimsCount = getReadySimsCount();
+ int activeSlotsCount = getActiveSlotsCount();
+ // If the number of ready SIM count and active slots equal to the number of SIMs
+ // need to be activated, the device is successfully switched to multiple active
+ // SIM mode.
+ if (readySimsCount == mNumOfActiveSim && activeSlotsCount == mNumOfActiveSim) {
+ Log.i(
+ TAG,
+ String.format("%d slots are active and ready.", mNumOfActiveSim));
+ mSimCardStateChangedLatch.countDown();
+ return;
+ }
+ Log.i(
+ TAG,
+ String.format(
+ "%d slots are active and %d SIMs are ready. Keep waiting until"
+ + " timeout.",
+ activeSlotsCount, readySimsCount));
+ }
+ };
+
+ @Override
+ protected Boolean doInBackground(Void aVoid) {
+ return updateMultiSimConfig();
+ }
+
+ @Override
+ protected void onPostExecute(Boolean isDsdsEnabled) {
+ if (isDsdsEnabled) {
+ setState(State.SUCCESS, Substate.UNUSED);
+ } else {
+ setState(State.ERROR, Substate.UNUSED);
+ }
+ }
+
+ public void run(int numberOfSimToActivate) {
+ mTelephonyManager = getContext().getSystemService(TelephonyManager.class);
+ mNumOfActiveSim = numberOfSimToActivate;
+
+ if (mNumOfActiveSim > mTelephonyManager.getSupportedModemCount()) {
+ Log.e(TAG, "Requested number of active SIM is greater than supported modem count.");
+ setState(State.ERROR, Substate.UNUSED);
+ return;
+ }
+ if (mTelephonyManager.doesSwitchMultiSimConfigTriggerReboot()) {
+ Log.e(TAG, "The device does not support reboot free DSDS.");
+ setState(State.ERROR, Substate.UNUSED);
+ return;
+ }
+ super.run(null /* param */);
+ }
+
+ // This method registers a ACTION_SIM_CARD_STATE_CHANGED broadcast receiver and wait for slot
+ // changes. If multi SIMs have been successfully enabled, it returns true. Otherwise, returns
+ // false.
+ private boolean updateMultiSimConfig() {
+ try {
+ getContext()
+ .registerReceiver(
+ mCarrierConfigChangeReceiver,
+ new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
+ mTelephonyManager.switchMultiSimConfig(mNumOfActiveSim);
+ if (mSimCardStateChangedLatch.await(
+ ENABLE_MULTI_SIM_TIMEOUT_MILLS, TimeUnit.MILLISECONDS)) {
+ Log.i(TAG, "Multi SIM were successfully enabled.");
+ return true;
+ } else {
+ Log.e(TAG, "Timeout for waiting SIM status.");
+ return false;
+ }
+ } catch (InterruptedException e) {
+ Log.e(TAG, "Failed to enable multiple SIM due to InterruptedException", e);
+ return false;
+ } finally {
+ getContext().unregisterReceiver(mCarrierConfigChangeReceiver);
+ }
+ }
+
+ // Returns how many SIMs have SIM ready state, not ready state, or removable slot with absent
+ // SIM state.
+ private int getReadySimsCount() {
+ int readyCardsCount = 0;
+ int activeSlotCount = mTelephonyManager.getActiveModemCount();
+ Set<Integer> activeRemovableLogicalSlots = getActiveRemovableLogicalSlotIds();
+ for (int logicalSlotId = 0; logicalSlotId < activeSlotCount; logicalSlotId++) {
+ int simState = mTelephonyManager.getSimState(logicalSlotId);
+ if (simState == TelephonyManager.SIM_STATE_READY
+ || simState == TelephonyManager.SIM_STATE_NOT_READY
+ || simState == TelephonyManager.SIM_STATE_LOADED
+ || (simState == TelephonyManager.SIM_STATE_ABSENT
+ && activeRemovableLogicalSlots.contains(logicalSlotId))) {
+ readyCardsCount++;
+ }
+ }
+ return readyCardsCount;
+ }
+
+ // Get active slots count from {@code TelephonyManager#getUiccSlotsInfo}.
+ private int getActiveSlotsCount() {
+ UiccSlotInfo[] slotsInfo = mTelephonyManager.getUiccSlotsInfo();
+ if (slotsInfo == null) {
+ return 0;
+ }
+ int activeSlots = 0;
+ for (UiccSlotInfo slotInfo : slotsInfo) {
+ if (slotInfo != null && slotInfo.getIsActive()) {
+ activeSlots++;
+ }
+ }
+ return activeSlots;
+ }
+
+ /** Returns a list of active removable logical slot ids. */
+ public Set<Integer> getActiveRemovableLogicalSlotIds() {
+ UiccSlotInfo[] infos = mTelephonyManager.getUiccSlotsInfo();
+ if (infos == null) {
+ return Collections.emptySet();
+ }
+ Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
+ for (UiccSlotInfo info : infos) {
+ if (info != null && info.getIsActive() && info.isRemovable()) {
+ activeRemovableLogicalSlotIds.add(info.getLogicalSlotIdx());
+ }
+ }
+ return activeRemovableLogicalSlotIds;
+ }
+}
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index f6f19b5..df62190 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -60,14 +60,12 @@
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.SettingsActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.ScanningSettings;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.AddNetworkFragment;
import com.android.settings.wifi.AddWifiNetworkPreference;
import com.android.settings.wifi.ConfigureWifiEntryFragment;
@@ -76,7 +74,6 @@
import com.android.settings.wifi.WifiConfigUiBase2;
import com.android.settings.wifi.WifiConnectListener;
import com.android.settings.wifi.WifiDialog2;
-import com.android.settings.wifi.WifiEnabler;
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -134,7 +131,7 @@
private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message";
@VisibleForTesting
- static final String PREF_KEY_DATA_USAGE = "wifi_data_usage";
+ static final String PREF_KEY_DATA_USAGE = "non_carrier_data_usage";
private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
@@ -188,8 +185,6 @@
*/
private boolean mIsRestricted;
- private WifiEnabler mWifiEnabler;
-
// Worker thread used for WifiPickerTracker work
private HandlerThread mWorkerThread;
@@ -230,10 +225,6 @@
mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
.findViewById(R.id.progress_bar_animation);
setProgressBarVisible(false);
-
- ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
- R.string.wifi_settings_primary_switch_title,
- R.string.wifi_settings_primary_switch_title);
}
}
@@ -351,9 +342,6 @@
@Override
public void onDestroyView() {
- if (mWifiEnabler != null) {
- mWifiEnabler.teardownSwitchController();
- }
mWorkerThread.quit();
super.onDestroyView();
@@ -363,8 +351,6 @@
public void onStart() {
super.onStart();
- mWifiEnabler = createWifiEnabler();
-
if (mIsRestricted) {
restrictUi();
}
@@ -377,15 +363,6 @@
getPreferenceScreen().removeAll();
}
- /**
- * @return new WifiEnabler
- */
- private WifiEnabler createWifiEnabler() {
- final SettingsActivity activity = (SettingsActivity) getActivity();
- return new WifiEnabler(activity, new SwitchBarController(activity.getSwitchBar()),
- mMetricsFeatureProvider);
- }
-
@Override
public void onResume() {
final Activity activity = getActivity();
@@ -399,22 +376,10 @@
restrictUi();
}
- if (mWifiEnabler != null) {
- mWifiEnabler.resume(activity);
- }
-
changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
}
@Override
- public void onPause() {
- super.onPause();
- if (mWifiEnabler != null) {
- mWifiEnabler.pause();
- }
- }
-
- @Override
public void onStop() {
getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
getView().removeCallbacks(mHideProgressBarRunnable);
@@ -863,10 +828,12 @@
@VisibleForTesting
void setAdditionalSettingsSummaries() {
- mConfigureWifiSettingsPreference.setSummary(getString(
- isWifiWakeupEnabled()
- ? R.string.wifi_configure_settings_preference_summary_wakeup_on
- : R.string.wifi_configure_settings_preference_summary_wakeup_off));
+ if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+ mConfigureWifiSettingsPreference.setSummary(getString(
+ isWifiWakeupEnabled()
+ ? R.string.wifi_configure_settings_preference_summary_wakeup_on
+ : R.string.wifi_configure_settings_preference_summary_wakeup_off));
+ }
final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 82df4aa..53d6c30 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -24,9 +24,6 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
import android.provider.Settings;
import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo;
@@ -71,7 +68,6 @@
private String mPreferenceGroupKey;
private PreferenceGroup mPreferenceGroup;
private SubscriptionManager mManager;
- private ConnectivityManager mConnectivityManager;
private SubscriptionsChangeListener mSubscriptionsListener;
private MobileDataEnabledListener mDataEnabledListener;
private DataConnectivityListener mConnectivityListener;
@@ -112,7 +108,6 @@
mPreferenceGroupKey = preferenceGroupKey;
mStartOrder = startOrder;
mManager = context.getSystemService(SubscriptionManager.class);
- mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
mSubscriptionPreferences = new ArrayMap<>();
mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
mDataEnabledListener = new MobileDataEnabledListener(context, this);
@@ -229,19 +224,6 @@
NO_CELL_DATA_TYPE_ICON, cutOut);
}
- private boolean activeNetworkIsCellular() {
- final Network activeNetwork = mConnectivityManager.getActiveNetwork();
- if (activeNetwork == null) {
- return false;
- }
- final NetworkCapabilities networkCapabilities = mConnectivityManager.getNetworkCapabilities(
- activeNetwork);
- if (networkCapabilities == null) {
- return false;
- }
- return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
- }
-
/**
* The summary can have either 1 or 2 lines depending on which services (calls, SMS, data) this
* subscription is the default for.
@@ -271,7 +253,7 @@
final TelephonyManager telMgrForSub = mContext.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
final boolean dataEnabled = telMgrForSub.isDataEnabled();
- if (dataEnabled && activeNetworkIsCellular()) {
+ if (dataEnabled && MobileNetworkUtils.activeNetworkIsCellular(mContext)) {
line2 = mContext.getString(R.string.mobile_data_active);
} else if (!dataEnabled) {
line2 = mContext.getString(R.string.mobile_data_off);
diff --git a/src/com/android/settings/network/SwitchSlotSidecar.java b/src/com/android/settings/network/SwitchSlotSidecar.java
new file mode 100644
index 0000000..cffb23f
--- /dev/null
+++ b/src/com/android/settings/network/SwitchSlotSidecar.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.annotation.IntDef;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.Nullable;
+
+/** {@link SidecarFragment} to switch SIM slot. */
+public class SwitchSlotSidecar
+ extends AsyncTaskSidecar<SwitchSlotSidecar.Param, SwitchSlotSidecar.Result> {
+ private static final String TAG = "SwitchSlotSidecar";
+
+ /** Commands */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({
+ Command.SWITCH_TO_REMOVABLE_SIM,
+ })
+ private @interface Command {
+ int SWITCH_TO_REMOVABLE_SIM = 0;
+ }
+
+ static class Param {
+ @Command int command;
+ int slotId;
+ }
+
+ static class Result {
+ Exception exception;
+ }
+
+ /** Returns a SwitchSlotSidecar sidecar instance. */
+ public static SwitchSlotSidecar get(FragmentManager fm) {
+ return SidecarFragment.get(fm, TAG, SwitchSlotSidecar.class, null /* args */);
+ }
+
+ @Nullable private Exception mException;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+
+ /** Starts switching to the removable slot. */
+ public void runSwitchToRemovableSlot(int id) {
+ Param param = new Param();
+ param.command = Command.SWITCH_TO_REMOVABLE_SIM;
+ param.slotId = id;
+ super.run(param);
+ }
+
+ /**
+ * Returns the exception thrown during the execution of a command. Will be null in any state
+ * other than {@link State#SUCCESS}, and may be null in that state if there was not an error.
+ */
+ @Nullable
+ public Exception getException() {
+ return mException;
+ }
+
+ @Override
+ protected Result doInBackground(@Nullable Param param) {
+ Result result = new Result();
+ if (param == null) {
+ result.exception = new UiccSlotsException("Null param");
+ return result;
+ }
+ try {
+ switch (param.command) {
+ case Command.SWITCH_TO_REMOVABLE_SIM:
+ UiccSlotUtil.switchToRemovableSlot(param.slotId, getContext());
+ break;
+ default:
+ Log.e(TAG, "Wrong command.");
+ break;
+ }
+ } catch (UiccSlotsException e) {
+ result.exception = e;
+ }
+ return result;
+ }
+
+ @Override
+ protected void onPostExecute(Result result) {
+ if (result.exception == null) {
+ setState(State.SUCCESS, Substate.UNUSED);
+ } else {
+ mException = result.exception;
+ setState(State.ERROR, Substate.UNUSED);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
new file mode 100644
index 0000000..132a2fd
--- /dev/null
+++ b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.telephony.EuiccOperationSidecar;
+
+/**
+ * This sidecar is responsible for switching to the removable slot. It disables the active eSIM
+ * profile before switching if there is one.
+ */
+public class SwitchToRemovableSlotSidecar extends EuiccOperationSidecar
+ implements SidecarFragment.Listener {
+
+ private static final String TAG = "DisableSubscriptionAndSwitchSlotSidecar";
+ private static final String ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT =
+ "disable_subscription_and_switch_slot_sidecar";
+
+ // Stateless members.
+ private SwitchToEuiccSubscriptionSidecar mSwitchToSubscriptionSidecar;
+ private SwitchSlotSidecar mSwitchSlotSidecar;
+ private int mPhysicalSlotId;
+
+ /** Returns a SwitchToRemovableSlotSidecar sidecar instance. */
+ public static SwitchToRemovableSlotSidecar get(FragmentManager fm) {
+ return SidecarFragment.get(fm, TAG, SwitchToRemovableSlotSidecar.class, null /* args */);
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mSwitchToSubscriptionSidecar =
+ SwitchToEuiccSubscriptionSidecar.get(getChildFragmentManager());
+ mSwitchSlotSidecar = SwitchSlotSidecar.get(getChildFragmentManager());
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mSwitchToSubscriptionSidecar.addListener(this);
+ mSwitchSlotSidecar.addListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ mSwitchToSubscriptionSidecar.removeListener(this);
+ mSwitchSlotSidecar.removeListener(this);
+ super.onPause();
+ }
+
+ @Override
+ protected String getReceiverAction() {
+ return ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT;
+ }
+
+ @Override
+ public void onStateChange(SidecarFragment fragment) {
+ if (fragment == mSwitchToSubscriptionSidecar) {
+ onSwitchToSubscriptionSidecarStateChange();
+ } else if (fragment == mSwitchSlotSidecar) {
+ onSwitchSlotSidecarStateChange();
+ } else {
+ Log.wtf(TAG, "Received state change from a sidecar not expected.");
+ }
+ }
+
+ /**
+ * Starts switching to the removable slot. It disables the active eSIM profile before switching
+ * if there is one.
+ *
+ * @param physicalSlotId removable physical SIM slot ID.
+ */
+ public void run(int physicalSlotId) {
+ mPhysicalSlotId = physicalSlotId;
+ SubscriptionManager subscriptionManager =
+ getContext().getSystemService(SubscriptionManager.class);
+ if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
+ .anyMatch(SubscriptionInfo::isEmbedded)) {
+ Log.i(TAG, "There is an active eSIM profile. Disable the profile first.");
+ // Use INVALID_SUBSCRIPTION_ID to disable the only active profile.
+ mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ } else {
+ Log.i(TAG, "There is no active eSIM profiles. Start to switch to removable slot.");
+ mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+ }
+ }
+
+ private void onSwitchToSubscriptionSidecarStateChange() {
+ switch (mSwitchToSubscriptionSidecar.getState()) {
+ case State.SUCCESS:
+ mSwitchToSubscriptionSidecar.reset();
+ Log.i(
+ TAG,
+ "Successfully disabled eSIM profile. Start to switch to Removable slot.");
+ mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+ break;
+ case State.ERROR:
+ mSwitchToSubscriptionSidecar.reset();
+ Log.i(TAG, "Failed to disable the active eSIM profile.");
+ setState(State.ERROR, Substate.UNUSED);
+ break;
+ }
+ }
+
+ private void onSwitchSlotSidecarStateChange() {
+ switch (mSwitchSlotSidecar.getState()) {
+ case State.SUCCESS:
+ mSwitchSlotSidecar.reset();
+ Log.i(TAG, "Successfully switched to removable slot.");
+ setState(State.SUCCESS, Substate.UNUSED);
+ break;
+ case State.ERROR:
+ mSwitchSlotSidecar.reset();
+ Log.i(TAG, "Failed to switch to removable slot.");
+ setState(State.ERROR, Substate.UNUSED);
+ break;
+ }
+ }
+}
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
new file mode 100644
index 0000000..792f02a
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.annotation.IntDef;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import com.google.common.collect.ImmutableList;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class UiccSlotUtil {
+
+ private static final String TAG = "UiccSlotUtil";
+
+ // TODO(b/171846124): Pass timeout value from LPA to Settings
+ private static final long WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25000;
+
+ public static final int INVALID_PHYSICAL_SLOT_ID = -1;
+
+ /**
+ * Mode for switching to eSIM slot which decides whether there is cleanup process, e.g.
+ * disabling test profile, after eSIM slot is activated and whether we will wait it finished.
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({
+ SwitchingEsimMode.NO_CLEANUP,
+ SwitchingEsimMode.ASYNC_CLEANUP,
+ SwitchingEsimMode.SYNC_CLEANUP
+ })
+ public @interface SwitchingEsimMode {
+ /** No cleanup process after switching to eSIM slot */
+ int NO_CLEANUP = 0;
+ /** Has cleanup process, but we will not wait it finished. */
+ int ASYNC_CLEANUP = 1;
+ /** Has cleanup process and we will wait until it's finished */
+ int SYNC_CLEANUP = 2;
+ }
+
+ /**
+ * Returns an immutable list of all UICC slots. If TelephonyManager#getUiccSlotsInfo returns, it
+ * returns an empty list instead.
+ */
+ public static ImmutableList<UiccSlotInfo> getSlotInfos(TelephonyManager telMgr) {
+ UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
+ if (slotInfos == null) {
+ return ImmutableList.of();
+ }
+ return ImmutableList.copyOf(slotInfos);
+ }
+
+ /**
+ * Switches to the removable slot. It waits for SIM_STATE_LOADED after switch. If slotId is
+ * INVALID_PHYSICAL_SLOT_ID, the method will use the first detected inactive removable slot.
+ *
+ * @param slotId the physical removable slot id.
+ * @param context the application context.
+ * @throws UiccSlotsException if there is an error.
+ */
+ public static synchronized void switchToRemovableSlot(int slotId, Context context)
+ throws UiccSlotsException {
+ if (ThreadUtils.isMainThread()) {
+ throw new IllegalThreadStateException(
+ "Do not call switchToRemovableSlot on the main thread.");
+ }
+ TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+ if (telMgr.isMultiSimEnabled()) {
+ // If this device supports multiple active slots, don't mess with TelephonyManager.
+ Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+ return;
+ }
+ UiccSlotInfo[] slots = telMgr.getUiccSlotsInfo();
+ if (slotId == INVALID_PHYSICAL_SLOT_ID) {
+ for (int i = 0; i < slots.length; i++) {
+ if (slots[i].isRemovable()
+ && !slots[i].getIsActive()
+ && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
+ && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
+ performSwitchToRemovableSlot(i, context);
+ return;
+ }
+ }
+ } else {
+ if (slotId >= slots.length || !slots[slotId].isRemovable()) {
+ throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
+ }
+ if (!slots[slotId].getIsActive()) {
+ performSwitchToRemovableSlot(slotId, context);
+ }
+ }
+ }
+
+ private static void performSwitchToRemovableSlot(int slotId, Context context)
+ throws UiccSlotsException {
+ CarrierConfigChangedReceiver receiver = null;
+ try {
+ CountDownLatch latch = new CountDownLatch(1);
+ receiver = new CarrierConfigChangedReceiver(latch);
+ receiver.registerOn(context);
+ switchSlots(context, slotId);
+ latch.await(WAIT_AFTER_SWITCH_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ Log.e(TAG, "Failed switching to physical slot.", e);
+ } finally {
+ if (receiver != null) {
+ context.unregisterReceiver(receiver);
+ }
+ }
+ }
+
+ /**
+ * Changes the logical slot to physical slot mapping. OEM should override this to provide
+ * device-specific implementation if the device supports switching slots.
+ *
+ * @param context the application context.
+ * @param physicalSlots List of physical slot ids in the order of logical slots.
+ */
+ private static void switchSlots(Context context, int... physicalSlots)
+ throws UiccSlotsException {
+ TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+ if (telMgr.isMultiSimEnabled()) {
+ // If this device supports multiple active slots, don't mess with TelephonyManager.
+ Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+ return;
+ }
+ if (!telMgr.switchSlots(physicalSlots)) {
+ throw new UiccSlotsException("Failed to switch slots");
+ }
+ }
+}
diff --git a/src/com/android/settings/network/UiccSlotsException.java b/src/com/android/settings/network/UiccSlotsException.java
new file mode 100644
index 0000000..2a2edc5
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotsException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+/** The exception that is thrown when an error happens in a call to {@link UiccSlotUtil}. */
+public class UiccSlotsException extends Exception {
+
+ public UiccSlotsException() {}
+
+ public UiccSlotsException(String message) {
+ super(message);
+ }
+
+ public UiccSlotsException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public UiccSlotsException(Throwable cause) {
+ super(cause);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index fd585a1..8a32a95 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -164,7 +164,22 @@
}
}
- private final static class PreferenceEntriesBuilder {
+ enum EnabledNetworks {
+ ENABLED_NETWORKS_UNKNOWN,
+ ENABLED_NETWORKS_CDMA_CHOICES,
+ ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES,
+ ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES,
+ ENABLED_NETWORKS_TDSCDMA_CHOICES,
+ ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES,
+ ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES,
+ ENABLED_NETWORKS_EXCEPT_GSM_CHOICES,
+ ENABLED_NETWORKS_EXCEPT_LTE_CHOICES,
+ ENABLED_NETWORKS_4G_CHOICES,
+ ENABLED_NETWORKS_CHOICES,
+ PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE
+ }
+
+ private final class PreferenceEntriesBuilder {
private CarrierConfigManager mCarrierConfigManager;
private Context mContext;
private TelephonyManager mTelephonyManager;
@@ -181,21 +196,6 @@
private List<String> mEntries = new ArrayList<>();
private List<Integer> mEntriesValue = new ArrayList<>();
- enum EnabledNetworks {
- ENABLED_NETWORKS_UNKNOWN,
- ENABLED_NETWORKS_CDMA_CHOICES,
- ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES,
- ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES,
- ENABLED_NETWORKS_TDSCDMA_CHOICES,
- ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES,
- ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES,
- ENABLED_NETWORKS_EXCEPT_GSM_CHOICES,
- ENABLED_NETWORKS_EXCEPT_LTE_CHOICES,
- ENABLED_NETWORKS_4G_CHOICES,
- ENABLED_NETWORKS_CHOICES,
- PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE
- }
-
PreferenceEntriesBuilder(Context context, int subId) {
this.mContext = context;
this.mSubId = subId;
@@ -226,7 +226,7 @@
int[] entryValuesInt;
switch (getEnabledNetworkType()) {
case ENABLED_NETWORKS_CDMA_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 4) {
@@ -240,7 +240,7 @@
addGlobalEntry(entryValuesInt[3]);
break;
case ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_no_lte_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 2) {
@@ -251,7 +251,7 @@
add1xEntry(entryValuesInt[1]);
break;
case ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_only_lte_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 2) {
@@ -262,7 +262,7 @@
addGlobalEntry(entryValuesInt[1]);
break;
case ENABLED_NETWORKS_TDSCDMA_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_tdscdma_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 3) {
@@ -275,7 +275,7 @@
add2gEntry(entryValuesInt[2]);
break;
case ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_gsm_lte_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 1) {
@@ -285,7 +285,7 @@
add3gEntry(entryValuesInt[0]);
break;
case ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_gsm_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 2) {
@@ -297,7 +297,7 @@
add3gEntry(entryValuesInt[1]);
break;
case ENABLED_NETWORKS_EXCEPT_GSM_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_gsm_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 2) {
@@ -309,7 +309,7 @@
add3gEntry(entryValuesInt[1]);
break;
case ENABLED_NETWORKS_EXCEPT_LTE_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_lte_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 2) {
@@ -320,7 +320,7 @@
add2gEntry(entryValuesInt[1]);
break;
case ENABLED_NETWORKS_4G_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 3) {
@@ -334,7 +334,7 @@
add2gEntry(entryValuesInt[2]);
break;
case ENABLED_NETWORKS_CHOICES:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.enabled_networks_values);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 3) {
@@ -346,7 +346,7 @@
add2gEntry(entryValuesInt[2]);
break;
case PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE:
- entryValues = mContext.getResources().getStringArray(
+ entryValues = getResourcesForSubId().getStringArray(
R.array.preferred_network_mode_values_world_mode);
entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
if (entryValuesInt.length < 3) {
@@ -354,9 +354,14 @@
"PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE index error.");
}
addGlobalEntry(entryValuesInt[0]);
- addCustomEntry(mContext.getString(R.string.network_world_mode_cdma_lte),
+
+ addCustomEntry(
+ getResourcesForSubId().getString(
+ R.string.network_world_mode_cdma_lte),
entryValuesInt[1]);
- addCustomEntry(mContext.getString(R.string.network_world_mode_gsm_lte),
+ addCustomEntry(
+ getResourcesForSubId().getString(
+ R.string.network_world_mode_gsm_lte),
entryValuesInt[2]);
break;
default:
@@ -571,8 +576,9 @@
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
setSelectedEntry(
TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
- setSummary(mContext.getString(R.string.network_5G)
- + mContext.getString(R.string.network_recommended));
+ setSummary(getResourcesForSubId().getString(R.string.network_5G)
+ + getResourcesForSubId().getString(
+ R.string.network_recommended));
break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
@@ -581,13 +587,15 @@
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
setSelectedEntry(TelephonyManagerConstants
.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
- setSummary(mContext.getString(R.string.network_5G)
- + mContext.getString(R.string.network_recommended));
+ setSummary(getResourcesForSubId().getString(R.string.network_5G)
+ + getResourcesForSubId().getString(
+ R.string.network_recommended));
break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);
- setSummary(mContext.getString(R.string.network_5G)
- + mContext.getString(R.string.network_recommended));
+ setSummary(getResourcesForSubId().getString(R.string.network_5G)
+ + getResourcesForSubId().getString(
+ R.string.network_recommended));
break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
setSelectedEntry(
@@ -597,13 +605,15 @@
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
setSummary(R.string.network_global);
} else {
- setSummary(mContext.getString(R.string.network_5G)
- + mContext.getString(R.string.network_recommended));
+ setSummary(getResourcesForSubId().getString(R.string.network_5G)
+ + getResourcesForSubId().getString(
+ R.string.network_recommended));
}
break;
default:
setSummary(
- mContext.getString(R.string.mobile_network_mode_error, networkMode));
+ getResourcesForSubId().getString(
+ R.string.mobile_network_mode_error, networkMode));
}
}
@@ -613,7 +623,7 @@
* @param networkType an LTE network mode without 5G.
* @return the corresponding network mode with 5G.
*/
- private static int addNrToLteNetworkType(int networkType) {
+ private int addNrToLteNetworkType(int networkType) {
switch(networkType) {
case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
@@ -647,7 +657,7 @@
* @param networkType an 5G network mode.
* @return the corresponding network mode without 5G.
*/
- private static int reduceNrToLteNetworkType(int networkType) {
+ private int reduceNrToLteNetworkType(int networkType) {
switch(networkType) {
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE:
return TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY;
@@ -689,8 +699,8 @@
private void add5gEntry(int value) {
boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
if (showNrList() && isNRValue) {
- mEntries.add(mContext.getString(R.string.network_5G)
- + mContext.getString(R.string.network_recommended));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_5G)
+ + getResourcesForSubId().getString(R.string.network_recommended));
mEntriesValue.add(value);
mIs5gEntryDisplayed = true;
} else {
@@ -706,7 +716,7 @@
Log.d(LOG_TAG, "addGlobalEntry. "
+ " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily
+ " allowed5GNetworkType: " + mAllowed5gNetworkType);
- mEntries.add(mContext.getString(R.string.network_global));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_global));
if (showNrList()) {
value = addNrToLteNetworkType(value);
}
@@ -722,9 +732,9 @@
*/
private void addLteEntry(int value) {
if (showNrList()) {
- mEntries.add(mContext.getString(R.string.network_lte_pure));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_lte_pure));
} else {
- mEntries.add(mContext.getString(R.string.network_lte));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_lte));
}
mEntriesValue.add(value);
}
@@ -734,25 +744,25 @@
*/
private void add4gEntry(int value) {
if (showNrList()) {
- mEntries.add(mContext.getString(R.string.network_4G_pure));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_4G_pure));
} else {
- mEntries.add(mContext.getString(R.string.network_4G));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_4G));
}
mEntriesValue.add(value);
}
private void add3gEntry(int value) {
- mEntries.add(mContext.getString(R.string.network_3G));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_3G));
mEntriesValue.add(value);
}
private void add2gEntry(int value) {
- mEntries.add(mContext.getString(R.string.network_2G));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_2G));
mEntriesValue.add(value);
}
private void add1xEntry(int value) {
- mEntries.add(mContext.getString(R.string.network_1x));
+ mEntries.add(getResourcesForSubId().getString(R.string.network_1x));
mEntriesValue.add(value);
}
@@ -800,7 +810,7 @@
}
private void setSummary(int summaryResId) {
- setSummary(mContext.getString(summaryResId));
+ setSummary(getResourcesForSubId().getString(summaryResId));
}
private void setSummary(String summary) {
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index dc915af..ba12146 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -57,8 +57,7 @@
private boolean mShow5gLimitedDialog;
boolean mIsNrEnabledFromCarrierConfig;
private boolean mHas5gCapability;
- @VisibleForTesting
- Integer mCallState;
+ private Integer mCallState;
private final List<On4gLteUpdateListener> m4gLteListeners;
protected static final int MODE_NONE = -1;
@@ -128,7 +127,7 @@
@Override
public void onStart() {
- if (mPhoneStateListener == null) {
+ if (!isModeMatched() || (mPhoneStateListener == null)) {
return;
}
mPhoneStateListener.register(mContext, mSubId);
@@ -199,8 +198,13 @@
return new VolteQueryImsState(mContext, subId);
}
+ @VisibleForTesting
+ boolean isCallStateIdle() {
+ return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
+ }
+
private boolean isUserControlAllowed(final PersistableBundle carrierConfig) {
- return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE)
+ return isCallStateIdle()
&& (carrierConfig != null)
&& carrierConfig.getBoolean(
CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
@@ -237,7 +241,9 @@
public void unregister() {
mCallState = null;
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ if (mTelephonyManager != null) {
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ }
}
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 99e69c7..b300c66 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -31,6 +31,7 @@
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
+import android.annotation.Nullable;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -41,6 +42,9 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
import android.os.PersistableBundle;
import android.os.SystemClock;
import android.os.SystemProperties;
@@ -69,6 +73,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.graph.SignalDrawable;
@@ -202,8 +207,7 @@
return bundle.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
}
- @VisibleForTesting
- static Intent buildPhoneAccountConfigureIntent(
+ public static Intent buildPhoneAccountConfigureIntent(
Context context, PhoneAccountHandle accountHandle) {
Intent intent = buildConfigureIntent(
context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
@@ -854,4 +858,45 @@
raf = ((NR & raf) > 0) ? (NR | raf) : raf;
return raf;
}
+
+ /**
+ * Copied from SubscriptionsPreferenceController#activeNetworkIsCellular()
+ */
+ public static boolean activeNetworkIsCellular(Context context) {
+ final ConnectivityManager connectivityManager =
+ context.getSystemService(ConnectivityManager.class);
+ final Network activeNetwork = connectivityManager.getActiveNetwork();
+ if (activeNetwork == null) {
+ return false;
+ }
+ final NetworkCapabilities networkCapabilities =
+ connectivityManager.getNetworkCapabilities(activeNetwork);
+ if (networkCapabilities == null) {
+ return false;
+ }
+ return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+ }
+
+ /**
+ * Copied from WifiCallingPreferenceController#isWifiCallingEnabled()
+ */
+ public static boolean isWifiCallingEnabled(Context context, int subId,
+ @Nullable WifiCallingQueryImsState queryImsState,
+ @Nullable PhoneAccountHandle phoneAccountHandle) {
+ if (phoneAccountHandle == null){
+ phoneAccountHandle = context.getSystemService(TelecomManager.class)
+ .getSimCallManagerForSubscription(subId);
+ }
+ boolean isWifiCallingEnabled;
+ if (phoneAccountHandle != null) {
+ final Intent intent = buildPhoneAccountConfigureIntent(context, phoneAccountHandle);
+ isWifiCallingEnabled = intent != null;
+ } else {
+ if (queryImsState == null) {
+ queryImsState = new WifiCallingQueryImsState(context, subId);
+ }
+ isWifiCallingEnabled = queryImsState.isReadyToWifiCalling();
+ }
+ return isWifiCallingEnabled;
+ }
}
diff --git a/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java b/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
index 2bd7de9..3972f39 100644
--- a/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
@@ -17,6 +17,7 @@
package com.android.settings.network.telephony;
import android.content.Context;
+import android.content.res.Resources;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
@@ -74,4 +75,13 @@
mContext.getSystemService(CarrierConfigManager.class);
return carrierConfigMgr.getConfigForSubId(subId);
}
+
+ /**
+ * Returns the resources associated with Subscription.
+ *
+ * @return Resources associated with Subscription.
+ */
+ public Resources getResourcesForSubId() {
+ return SubscriptionManager.getResourcesForSubId(mContext, mSubId);
+ }
}
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 905ead0..919415b 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -22,15 +22,22 @@
import android.os.UserManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
import android.text.TextUtils;
import android.util.Log;
-import androidx.appcompat.app.AlertDialog;
-
import com.android.settings.R;
import com.android.settings.SidecarFragment;
+import com.android.settings.network.EnableMultiSimSidecar;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+import com.android.settings.network.SwitchToRemovableSlotSidecar;
+import com.android.settings.network.UiccSlotUtil;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
/** This dialog activity handles both eSIM and pSIM subscriptions enabling and disabling. */
public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogActivity
@@ -41,6 +48,11 @@
private static final String ARG_enable = "enable";
// Dialog tags
private static final int DIALOG_TAG_DISABLE_SIM_CONFIRMATION = 1;
+ private static final int DIALOG_TAG_ENABLE_SIM_CONFIRMATION = 2;
+ private static final int DIALOG_TAG_ENABLE_DSDS_CONFIRMATION = 3;
+ private static final int DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION = 4;
+ // Number of SIMs for DSDS
+ private static final int NUM_OF_SIMS_FOR_DSDS = 2;
/**
* Returns an intent of ToggleSubscriptionDialogActivity.
@@ -58,8 +70,11 @@
private SubscriptionInfo mSubInfo;
private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
- private AlertDialog mToggleSimConfirmDialog;
+ private SwitchToRemovableSlotSidecar mSwitchToRemovableSlotSidecar;
+ private EnableMultiSimSidecar mEnableMultiSimSidecar;
private boolean mEnable;
+ private boolean mIsEsimOperation;
+ private TelephonyManager mTelMgr;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -67,6 +82,7 @@
Intent intent = getIntent();
int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mTelMgr = getSystemService(TelephonyManager.class);
UserManager userManager = getSystemService(UserManager.class);
if (!userManager.isAdminUser()) {
@@ -82,13 +98,16 @@
}
mSubInfo = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+ mIsEsimOperation = mSubInfo != null && mSubInfo.isEmbedded();
mSwitchToEuiccSubscriptionSidecar =
SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+ mSwitchToRemovableSlotSidecar = SwitchToRemovableSlotSidecar.get(getFragmentManager());
+ mEnableMultiSimSidecar = EnableMultiSimSidecar.get(getFragmentManager());
mEnable = intent.getBooleanExtra(ARG_enable, true);
if (savedInstanceState == null) {
if (mEnable) {
- handleEnablingSubAction();
+ showEnableSubDialog();
} else {
showDisableSimConfirmDialog();
}
@@ -99,10 +118,14 @@
protected void onResume() {
super.onResume();
mSwitchToEuiccSubscriptionSidecar.addListener(this);
+ mSwitchToRemovableSlotSidecar.addListener(this);
+ mEnableMultiSimSidecar.addListener(this);
}
@Override
protected void onPause() {
+ mEnableMultiSimSidecar.removeListener(this);
+ mSwitchToRemovableSlotSidecar.removeListener(this);
mSwitchToEuiccSubscriptionSidecar.removeListener(this);
super.onPause();
}
@@ -111,19 +134,25 @@
public void onStateChange(SidecarFragment fragment) {
if (fragment == mSwitchToEuiccSubscriptionSidecar) {
handleSwitchToEuiccSubscriptionSidecarStateChange();
+ } else if (fragment == mSwitchToRemovableSlotSidecar) {
+ handleSwitchToRemovableSlotSidecarStateChange();
+ } else if (fragment == mEnableMultiSimSidecar) {
+ handleEnableMultiSimSidecarStateChange();
}
}
@Override
public void onConfirm(int tag, boolean confirmed) {
- if (!confirmed) {
+ if (!confirmed
+ && tag != DIALOG_TAG_ENABLE_DSDS_CONFIRMATION
+ && tag != DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION) {
finish();
return;
}
switch (tag) {
case DIALOG_TAG_DISABLE_SIM_CONFIRMATION:
- if (mSubInfo.isEmbedded()) {
+ if (mIsEsimOperation) {
Log.i(TAG, "Disabling the eSIM profile.");
showProgressDialog(
getString(R.string.privileged_action_disable_sub_dialog_progress));
@@ -132,6 +161,51 @@
return;
}
Log.i(TAG, "Disabling the pSIM profile.");
+ handleTogglePsimAction();
+ break;
+ case DIALOG_TAG_ENABLE_DSDS_CONFIRMATION:
+ if (!confirmed) {
+ Log.i(TAG, "User cancel the dialog to enable DSDS.");
+ showEnableSimConfirmDialog();
+ return;
+ }
+ if (mTelMgr.doesSwitchMultiSimConfigTriggerReboot()) {
+ Log.i(TAG, "Device does not support reboot free DSDS.");
+ showRebootConfirmDialog();
+ return;
+ }
+ Log.i(
+ TAG,
+ "Enabling DSDS without rebooting. "
+ + getString(R.string.sim_action_enabling_sim_without_carrier_name));
+ showProgressDialog(
+ getString(R.string.sim_action_enabling_sim_without_carrier_name));
+ mEnableMultiSimSidecar.run(NUM_OF_SIMS_FOR_DSDS);
+ break;
+ case DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION:
+ if (!confirmed) {
+ Log.i(TAG, "User cancel the dialog to reboot to enable DSDS.");
+ showEnableSimConfirmDialog();
+ return;
+ }
+ Log.i(TAG, "User confirmed reboot to enable DSDS.");
+ mTelMgr.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS);
+ // TODO(b/170507290): Store a bit in preferences for displaying the notification
+ // after the reboot.
+ break;
+ case DIALOG_TAG_ENABLE_SIM_CONFIRMATION:
+ Log.i(TAG, "User confirmed to enable the subscription.");
+ if (mIsEsimOperation) {
+ showProgressDialog(
+ getString(
+ R.string.sim_action_switch_sub_dialog_progress,
+ mSubInfo.getDisplayName()));
+ mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+ return;
+ }
+ showProgressDialog(
+ getString(R.string.sim_action_enabling_sim_without_carrier_name));
+ mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID);
break;
default:
Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
@@ -165,10 +239,105 @@
}
}
+ private void handleSwitchToRemovableSlotSidecarStateChange() {
+ switch (mSwitchToRemovableSlotSidecar.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ Log.i(TAG, "Successfully switched to removable slot.");
+ mSwitchToRemovableSlotSidecar.reset();
+ handleTogglePsimAction();
+ dismissProgressDialog();
+ finish();
+ break;
+ case SidecarFragment.State.ERROR:
+ Log.e(TAG, "Failed switching to removable slot.");
+ mSwitchToRemovableSlotSidecar.reset();
+ dismissProgressDialog();
+ showErrorDialog(
+ getString(R.string.sim_action_enable_sim_fail_title),
+ getString(R.string.sim_action_enable_sim_fail_text));
+ break;
+ }
+ }
+
+ private void handleEnableMultiSimSidecarStateChange() {
+ switch (mEnableMultiSimSidecar.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ mEnableMultiSimSidecar.reset();
+ Log.i(TAG, "Successfully switched to DSDS without reboot.");
+ handleEnableSubscriptionAfterEnablingDsds();
+ break;
+ case SidecarFragment.State.ERROR:
+ mEnableMultiSimSidecar.reset();
+ Log.i(TAG, "Failed to switch to DSDS without rebooting.");
+ ProgressDialogFragment.dismiss(getFragmentManager());
+ showErrorDialog(
+ getString(R.string.dsds_activation_failure_title),
+ getString(R.string.dsds_activation_failure_body_msg2));
+ break;
+ }
+ }
+
+ private void handleEnableSubscriptionAfterEnablingDsds() {
+ if (mIsEsimOperation) {
+ Log.i(TAG, "DSDS enabled, start to enable profile: " + mSubInfo.getSubscriptionId());
+ // For eSIM operations, we simply switch to the selected eSIM profile.
+ mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+ return;
+ }
+
+ Log.i(TAG, "DSDS enabled, start to enable pSIM profile.");
+ handleTogglePsimAction();
+ ProgressDialogFragment.dismiss(getFragmentManager());
+ finish();
+ }
+
+ private void handleTogglePsimAction() {
+ if (mSubscriptionManager.canDisablePhysicalSubscription() && mSubInfo != null) {
+ mSubscriptionManager.setUiccApplicationsEnabled(mSubInfo.getSubscriptionId(), mEnable);
+ } else {
+ Log.i(
+ TAG,
+ "The device does not support toggling pSIM. It is enough to just "
+ + "enable the removable slot.");
+ }
+ }
+
/* Handles the enabling SIM action. */
- private void handleEnablingSubAction() {
- Log.i(TAG, "handleEnableSub");
- // TODO(b/160819390): Implement enabling eSIM/pSIM profile.
+ private void showEnableSubDialog() {
+ Log.i(TAG, "Handle subscription enabling.");
+ if (isDsdsConditionSatisfied()) {
+ showEnableDsdsConfirmDialog();
+ return;
+ }
+ if (!mIsEsimOperation && mTelMgr.isMultiSimEnabled()) {
+ Log.i(TAG, "Toggle on pSIM, no dialog displayed.");
+ handleTogglePsimAction();
+ finish();
+ return;
+ }
+ showEnableSimConfirmDialog();
+ }
+
+ private void showEnableDsdsConfirmDialog() {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_DSDS_CONFIRMATION,
+ getString(R.string.sim_action_enable_dsds_title),
+ getString(R.string.sim_action_enable_dsds_text),
+ getString(R.string.sim_action_continue),
+ getString(R.string.sim_action_no_thanks));
+ }
+
+ private void showRebootConfirmDialog() {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION,
+ getString(R.string.sim_action_restart_title),
+ getString(R.string.sim_action_enable_dsds_text),
+ getString(R.string.sim_action_reboot),
+ getString(R.string.cancel));
}
/* Displays the SIM toggling confirmation dialog. */
@@ -191,10 +360,116 @@
getString(R.string.cancel));
}
- /* Dismisses the SIM toggling confirmation dialog. */
- private void dismissToggleSimConfirmDialog() {
- if (mToggleSimConfirmDialog != null) {
- mToggleSimConfirmDialog.dismiss();
+ private void showEnableSimConfirmDialog() {
+ List<SubscriptionInfo> activeSubs =
+ SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
+ SubscriptionInfo activeSub = activeSubs.isEmpty() ? null : activeSubs.get(0);
+ if (activeSub == null) {
+ Log.i(TAG, "No active subscriptions available.");
+ showNonSwitchSimConfirmDialog();
+ return;
}
+ Log.i(TAG, "Found active subscription.");
+ boolean isBetweenEsim = mIsEsimOperation && activeSub.isEmbedded();
+ if (mTelMgr.isMultiSimEnabled() && !isBetweenEsim) {
+ showNonSwitchSimConfirmDialog();
+ return;
+ }
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+ getSwitchSubscriptionTitle(),
+ getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
+ getSwitchDialogPosBtnText(),
+ getString(android.R.string.cancel));
+ }
+
+ private void showNonSwitchSimConfirmDialog() {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+ getEnableSubscriptionTitle(),
+ null /* msg */,
+ getString(R.string.yes),
+ getString(android.R.string.cancel));
+ }
+
+ private String getSwitchDialogPosBtnText() {
+ return mIsEsimOperation
+ ? getString(
+ R.string.sim_action_switch_sub_dialog_confirm, mSubInfo.getDisplayName())
+ : getString(R.string.sim_switch_button);
+ }
+
+ private String getEnableSubscriptionTitle() {
+ if (mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())) {
+ return getString(R.string.sim_action_enable_sub_dialog_title_without_carrier_name);
+ }
+ return getString(R.string.sim_action_enable_sub_dialog_title, mSubInfo.getDisplayName());
+ }
+
+ private String getSwitchSubscriptionTitle() {
+ if (mIsEsimOperation) {
+ return getString(
+ R.string.sim_action_switch_sub_dialog_title, mSubInfo.getDisplayName());
+ }
+ return getString(R.string.sim_action_switch_psim_dialog_title);
+ }
+
+ private String getSwitchDialogBodyMsg(SubscriptionInfo activeSub, boolean betweenEsim) {
+ if (betweenEsim && mIsEsimOperation) {
+ return getString(
+ R.string.sim_action_switch_sub_dialog_text_downloaded,
+ mSubInfo.getDisplayName(),
+ activeSub.getDisplayName());
+ } else if (mIsEsimOperation) {
+ return getString(
+ R.string.sim_action_switch_sub_dialog_text,
+ mSubInfo.getDisplayName(),
+ activeSub.getDisplayName());
+ } else {
+ return getString(
+ R.string.sim_action_switch_sub_dialog_text_single_sim,
+ activeSub.getDisplayName());
+ }
+ }
+
+ private boolean isDsdsConditionSatisfied() {
+ if (mTelMgr.isMultiSimEnabled()) {
+ Log.i(TAG, "DSDS is already enabled. Condition not satisfied.");
+ return false;
+ }
+ if (mTelMgr.isMultiSimSupported() != TelephonyManager.MULTISIM_ALLOWED) {
+ Log.i(TAG, "Hardware does not support DSDS.");
+ return false;
+ }
+ ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
+ boolean isRemovableSimEnabled =
+ slotInfos.stream()
+ .anyMatch(
+ slot ->
+ slot != null
+ && slot.isRemovable()
+ && slot.getIsActive()
+ && slot.getCardStateInfo()
+ == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
+ if (mIsEsimOperation && isRemovableSimEnabled) {
+ Log.i(TAG, "eSIM operation and removable SIM is enabled. DSDS condition satisfied.");
+ return true;
+ }
+ boolean isEsimProfileEnabled =
+ SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager).stream()
+ .anyMatch(SubscriptionInfo::isEmbedded);
+ if (!mIsEsimOperation && isEsimProfileEnabled) {
+ Log.i(
+ TAG,
+ "Removable SIM operation and eSIM profile is enabled. DSDS condition"
+ + " satisfied.");
+ return true;
+ }
+ Log.i(TAG, "DSDS condition not satisfied.");
+ return false;
}
}
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index b38fe07..6bfd650 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -71,7 +71,7 @@
@Override
public int getAvailabilityStatus(int subId) {
return SubscriptionManager.isValidSubscriptionId(subId)
- && isWifiCallingEnabled(mContext, subId)
+ && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null, null)
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@@ -221,23 +221,4 @@
mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
}
}
-
- private boolean isWifiCallingEnabled(Context context, int subId) {
- final PhoneAccountHandle simCallManager =
- context.getSystemService(TelecomManager.class)
- .getSimCallManagerForSubscription(subId);
- final int phoneId = SubscriptionManager.getSlotIndex(subId);
-
- boolean isWifiCallingEnabled;
- if (simCallManager != null) {
- final Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(
- context, simCallManager);
-
- isWifiCallingEnabled = intent != null;
- } else {
- isWifiCallingEnabled = queryImsState(subId).isReadyToWifiCalling();
- }
-
- return isWifiCallingEnabled;
- }
}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
index 76b9ad0..4959565 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -67,13 +67,14 @@
public boolean onPreferenceChange(Preference preference, Object object) {
final int newMode = Integer.parseInt((String) object);
//TODO(b/117611981): only set it in one place
- if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) {
+ try {
+ mTelephonyManager.setCdmaSubscriptionMode(newMode);
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
return true;
+ } catch (IllegalStateException e) {
+ return false;
}
-
- return false;
}
@VisibleForTesting
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index 13324fc..2b0c221 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -63,13 +63,14 @@
public boolean onPreferenceChange(Preference preference, Object object) {
int newMode = Integer.parseInt((String) object);
//TODO(b/117611981): only set it in one place
- if (mTelephonyManager.setCdmaRoamingMode(newMode)) {
+ try {
+ mTelephonyManager.setCdmaRoamingMode(newMode);
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE, newMode);
return true;
+ } catch (IllegalStateException e) {
+ return false;
}
-
- return false;
}
private void resetCdmaRoamingModeToDefault() {
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index ac648a5..a17298f 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -62,8 +62,8 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
- super.onApplyThemeResource(theme, resid, first);
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ super.onApplyThemeResource(theme, new_resid, first);
}
@Override
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 1d41bb9..e3f5063 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -447,9 +447,9 @@
if (cursor != null && cursor.moveToFirst()) {
do {
String contact = cursor.getString(0);
- if (contact != null) {
- starredContacts.add(contact);
- }
+ starredContacts.add(contact != null ? contact :
+ mContext.getString(R.string.zen_mode_starred_contacts_empty_name));
+
} while (cursor.moveToNext());
}
return starredContacts;
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index e393af5..a73b73a 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -105,8 +105,8 @@
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
- super.onApplyThemeResource(theme, resid, first);
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ super.onApplyThemeResource(theme, new_resid, first);
}
public static class IntentBuilder {
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index ff9bf1a..6e9cf98 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -94,8 +94,8 @@
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
- super.onApplyThemeResource(theme, resid, first);
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ super.onApplyThemeResource(theme, new_resid, first);
}
public static class IntentBuilder {
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 383ae4f..3ecff58 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -64,14 +64,14 @@
return;
}
if (UserManager.get(this).isManagedProfile(credentialOwnerUserId)) {
- setTheme(SetupWizardUtils.getTheme(getIntent()));
+ setTheme(SetupWizardUtils.getTheme(this, getIntent()));
mConfirmCredentialTheme = ConfirmCredentialTheme.WORK;
} else if (getIntent().getBooleanExtra(
ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)) {
setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
} else {
- setTheme(SetupWizardUtils.getTheme(getIntent()));
+ setTheme(SetupWizardUtils.getTheme(this, getIntent()));
mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
}
super.onCreate(savedState);
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 5a0a2a6..7818f0d 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -31,7 +31,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.LinearLayout;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -42,8 +41,6 @@
import com.android.settings.R;
import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils;
-import com.android.settings.biometrics.BiometricEnrollActivity;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.google.android.setupdesign.GlifPreferenceLayout;
@@ -72,8 +69,8 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
- super.onApplyThemeResource(theme, resid, first);
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+ super.onApplyThemeResource(theme, new_resid, first);
}
@Override
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 3352991..39355f3 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -88,9 +88,7 @@
@Override
public void onAttach(Context context) {
super.onAttach(context);
- use(AmbientDisplayAlwaysOnPreferenceController.class)
- .setConfig(getConfig(context))
- .setCallback(this::updatePreferenceStates);
+ use(AmbientDisplayAlwaysOnPreferenceController.class).setConfig(getConfig(context));
use(AmbientDisplayNotificationsPreferenceController.class).setConfig(getConfig(context));
use(DoubleTapScreenPreferenceController.class).setConfig(getConfig(context));
use(PickupGesturePreferenceController.class).setConfig(getConfig(context));
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index 7a4cd5b..3007953 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -30,7 +30,6 @@
import com.android.settings.display.ScreenTimeoutPreferenceController;
import com.android.settings.flashlight.FlashlightSlice;
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
-import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;
import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice;
import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice;
@@ -170,15 +169,6 @@
.appendPath("mobile_data")
.build();
/**
- * Backing Uri for the storage slice.
- */
- public static final Uri STORAGE_SLICE_URI = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
- .appendPath("storage_card")
- .build();
- /**
* Full {@link Uri} for the Alarm volume Slice.
*/
public static final Uri VOLUME_ALARM_URI = new Uri.Builder()
@@ -341,7 +331,6 @@
sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class);
sUriToSlice.put(MEDIA_OUTPUT_SLICE_URI, MediaOutputSlice.class);
sUriToSlice.put(MOBILE_DATA_SLICE_URI, MobileDataSlice.class);
- sUriToSlice.put(STORAGE_SLICE_URI, StorageSlice.class);
sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class);
sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);
sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 50cb5de..d92418d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -747,8 +747,9 @@
return;
}
try {
+ getContext().getSystemService(UserManager.class)
+ .removeUserOrSetEphemeral(UserHandle.myUserId());
ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);
- getContext().getSystemService(UserManager.class).removeUser(UserHandle.myUserId());
} catch (RemoteException re) {
Log.e(TAG, "Unable to remove self user");
}
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 3009ae7..81ca183 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,6 +45,14 @@
private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
@Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+ getActivity().setTitle(R.string.network_and_internet_preferences_title);
+ }
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.CONFIGURE_WIFI;
}
@@ -54,7 +64,10 @@
@Override
public int getInitialExpandedChildCount() {
- int tileLimit = 2;
+ int tileLimit = 1;
+ if (mWifiWakeupPreferenceController.isAvailable()) {
+ tileLimit++;
+ }
if (mUseOpenWifiPreferenceController.isAvailable()) {
tileLimit++;
}
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index a80029b..37013f2 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -161,6 +161,7 @@
private ScrollView mDialogContainer;
private Spinner mSecuritySpinner;
@VisibleForTesting Spinner mEapMethodSpinner;
+ private int mLastShownEapMethod;
@VisibleForTesting Spinner mEapSimSpinner; // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
private Spinner mEapCaCertSpinner;
private Spinner mEapOcspSpinner;
@@ -1027,6 +1028,7 @@
final int eapMethod = enterpriseConfig.getEapMethod();
final int phase2Method = enterpriseConfig.getPhase2Method();
mEapMethodSpinner.setSelection(eapMethod);
+ mLastShownEapMethod = eapMethod;
showEapFieldsByMethod(eapMethod);
switch (eapMethod) {
case Eap.PEAP:
@@ -1597,7 +1599,11 @@
mSsidScanButton.setVisibility(View.GONE);
}
} else if (parent == mEapMethodSpinner) {
- showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ true);
+ final int selectedItemPosition = mEapMethodSpinner.getSelectedItemPosition();
+ if (mLastShownEapMethod != selectedItemPosition) {
+ mLastShownEapMethod = selectedItemPosition;
+ showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ true);
+ }
} else if (parent == mEapCaCertSpinner) {
showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ false);
} else if (parent == mPhase2Spinner
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 754f99d..000ed3e 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -45,6 +45,7 @@
import com.android.wifitrackerlib.WifiEntry;
import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
import java.time.Clock;
import java.time.ZoneOffset;
@@ -105,7 +106,7 @@
protected void onCreate(Bundle savedInstanceState) {
mIntent = getIntent();
if (WizardManagerHelper.isSetupWizardIntent(mIntent)) {
- setTheme(SetupWizardUtils.getTransparentTheme(mIntent));
+ setTheme(SetupWizardUtils.getTransparentTheme(this, mIntent));
}
super.onCreate(savedInstanceState);
@@ -151,13 +152,16 @@
}
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
+ final int targetStyle = ThemeHelper.isSetupWizardDayNightEnabled(this)
+ ? R.style.SuwAlertDialogThemeCompat_DayNight :
+ R.style.SuwAlertDialogThemeCompat_Light;
if (mIsWifiTrackerLib) {
mDialog2 = WifiDialog2.createModal(this, this,
mNetworkDetailsTracker.getWifiEntry(),
- WifiConfigUiBase2.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+ WifiConfigUiBase2.MODE_CONNECT, targetStyle);
} else {
mDialog = WifiDialog.createModal(this, this, mAccessPoint,
- WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+ WifiConfigUiBase.MODE_CONNECT, targetStyle);
}
} else {
if (mIsWifiTrackerLib) {
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index e9fd350..5869705 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -26,6 +26,7 @@
import android.location.LocationManager;
import android.net.wifi.WifiManager;
import android.provider.Settings;
+import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -44,6 +45,7 @@
* {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be
* enabled.
*/
+// TODO(b/167474581): Should clean up this controller when Provider Model finished.
public class WifiWakeupPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnPause, OnResume {
@@ -89,6 +91,9 @@
@Override
public int getAvailabilityStatus() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+ return CONDITIONALLY_UNAVAILABLE;
+ }
return AVAILABLE;
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
index a7daee6..499f66c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -45,8 +45,8 @@
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
- resid = SetupWizardUtils.getTheme(getIntent());
+ final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
theme.applyStyle(R.style.SetupWizardPartnerResource, /* force */ true);
- super.onApplyThemeResource(theme, resid, first);
+ super.onApplyThemeResource(theme, new_resid, first);
}
}
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index 324d68c..2858ab4 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -224,7 +224,7 @@
private SliceAction getActivityAction(int requestCode, Intent intent, IconCompat icon,
CharSequence title) {
final PendingIntent pi = PendingIntent.getActivity(mContext, requestCode, intent,
- 0 /* flags */);
+ PendingIntent.FLAG_IMMUTABLE /* flags */);
return SliceAction.createDeeplink(pi, icon, ListBuilder.ICON_IMAGE, title);
}
@@ -289,7 +289,7 @@
private PendingIntent getPrimaryAction() {
final Intent intent = getIntent();
return PendingIntent.getActivity(mContext, 0 /* requestCode */,
- intent, 0 /* flags */);
+ intent, PendingIntent.FLAG_IMMUTABLE /* flags */);
}
private Set<String> getKeywords() {
diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
index 5a88198..ec33fad 100644
--- a/tests/robotests/src/com/android/settings/MainClearTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -236,7 +236,7 @@
@Test
public void testEsimRecheckBoxDefaultChecked() {
- assertThat(((CheckBox) mContentView.findViewById(R.id.erase_esim)).isChecked()).isTrue();
+ assertThat(((CheckBox) mContentView.findViewById(R.id.erase_esim)).isChecked()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 5f4f31b..5fddb80 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -18,20 +18,42 @@
import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
import android.os.Bundle;
import android.sysprop.SetupWizardProperties;
+import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class SetupWizardUtilsTest {
+ private Context mContext;
+
+ @Before
+ public void setup() {
+ PartnerConfigHelper.resetInstance();
+ mContext = ApplicationProvider.getApplicationContext();
+ }
+
@Test
public void testCopySetupExtras() {
Intent fromIntent = new Intent();
@@ -66,12 +88,13 @@
}
@Test
- public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
+ public void testGetTheme_withIntentExtra_shouldReturnTheme() {
SetupWizardProperties.theme(ThemeHelper.THEME_GLIF);
Intent intent = createSetupWizardIntent();
intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
- assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV2Theme);
}
@Test
@@ -79,26 +102,109 @@
SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
Intent intent = createSetupWizardIntent();
- assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV2Theme_Light);
}
@Test
- public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
+ public void testGetTheme_whenSuwDayNightEnabledAndWithIntentExtra_shouldReturnDayNightTheme() {
+ FakePartnerContentProvider provider =
+ Robolectric.setupContentProvider(
+ FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+ provider.injectFakeDayNightEnabledResult(true);
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+ Intent intent = createSetupWizardIntent();
+ intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV2Theme_DayNight);
+ }
+
+ @Test
+ public void testGetTheme_glifV3Light_shouldReturnLightTheme() {
SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
Intent intent = createSetupWizardIntent();
- assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
- assertThat(SetupWizardUtils.getTransparentTheme(intent))
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme_Light);
+ assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
.isEqualTo(R.style.GlifV3Theme_Light_Transparent);
}
@Test
- public void testGetTheme_nonSuw_shouldReturnDayNightTheme() {
+ public void testGetTheme_glifV3_shouldReturnTheme() {
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+ Intent intent = createSetupWizardIntent();
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme);
+ assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme_Transparent);
+ }
+
+ @Test
+ public void testGetTheme_whenSuwDayNightDisabledAndGlifV2_shouldReturnLightTheme() {
+ FakePartnerContentProvider provider =
+ Robolectric.setupContentProvider(
+ FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+ provider.injectFakeDayNightEnabledResult(false);
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+ Intent intent = createSetupWizardIntent();
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV2Theme_Light);
+ }
+
+ @Test
+ public void testGetTheme_whenSuwDayNightEnabledAndGlifV2_shouldReturnDayNightTheme() {
+ FakePartnerContentProvider provider =
+ Robolectric.setupContentProvider(
+ FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+ provider.injectFakeDayNightEnabledResult(true);
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+ Intent intent = createSetupWizardIntent();
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV2Theme_DayNight);
+ }
+
+ @Test
+ public void testGetTheme_whenSuwDayNightDisabledAndGlifV3_shouldReturnTheme() {
+ FakePartnerContentProvider provider =
+ Robolectric.setupContentProvider(
+ FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+ provider.injectFakeDayNightEnabledResult(false);
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+ Intent intent = createSetupWizardIntent();
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme);
+ assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme_Transparent);
+ }
+
+ @Test
+ public void testGetTheme_whenSuwDayNightEnabledAndGlifV3_shouldReturnDayNightTheme() {
+ FakePartnerContentProvider provider =
+ Robolectric.setupContentProvider(
+ FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+ provider.injectFakeDayNightEnabledResult(true);
+ SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+ Intent intent = createSetupWizardIntent();
+
+ assertThat(SetupWizardUtils.getTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme_DayNight);
+ assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+ .isEqualTo(R.style.GlifV3Theme_DayNight_Transparent);
+ }
+
+ @Test
+ public void testGetTheme_nonSuw_shouldReturnTheme() {
SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent();
- assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme);
- assertThat(SetupWizardUtils.getTransparentTheme(intent))
+ assertThat(SetupWizardUtils.getTheme(mContext, intent)).isEqualTo(R.style.GlifV3Theme);
+ assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
.isEqualTo(R.style.GlifV3Theme_Transparent);
}
@@ -107,4 +213,65 @@
.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
}
+
+ private static final class FakePartnerContentProvider extends ContentProvider {
+
+ private final Bundle mFakeProviderDayNightEnabledResultBundle = new Bundle();
+
+ @Override
+ public boolean onCreate() {
+ return true;
+ }
+
+ @Override
+ public Cursor query(
+ @NonNull Uri uri,
+ @Nullable String[] projection,
+ @Nullable String selection,
+ @Nullable String[] selectionArgs,
+ @Nullable String sortOrder) {
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public String getType(@NonNull Uri uri) {
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+ return null;
+ }
+
+ @Override
+ public int delete(
+ @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+ return 0;
+ }
+
+ @Override
+ public int update(
+ @NonNull Uri uri,
+ @Nullable ContentValues values,
+ @Nullable String selection,
+ @Nullable String[] selectionArgs) {
+ return 0;
+ }
+
+ @Override
+ public Bundle call(String method, String arg, Bundle extras) {
+ if (TextUtils.equals(method, "isSuwDayNightEnabled")) {
+ return mFakeProviderDayNightEnabledResultBundle;
+ }
+ return null;
+ }
+
+ public FakePartnerContentProvider injectFakeDayNightEnabledResult(boolean dayNightEnabled) {
+ mFakeProviderDayNightEnabledResultBundle.putBoolean(
+ "isSuwDayNightEnabled", dayNightEnabled);
+ return this;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
index 9ad00eb..a04f0cf 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
@@ -16,6 +16,10 @@
package com.android.settings.accessibility;
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -33,11 +37,14 @@
import androidx.fragment.app.FragmentActivity;
+import com.android.settings.SettingsActivity;
import com.android.settings.testutils.shadow.ShadowFragment;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@@ -61,6 +68,8 @@
private Context mContext;
private AccessibilityDetailsSettingsFragment mFragment;
private ShadowAccessibilityManager mShadowAccessibilityManager;
+ @Captor
+ private ArgumentCaptor<Intent> mIntentArgumentCaptor;
@Mock private FragmentActivity mActivity;
@Before
@@ -76,39 +85,43 @@
}
@Test
- public void onCreate_hasValidExtraComponentName_shouldOpenAccessibilityDetailsSettings() {
+ public void onCreate_hasValidExtraComponentName_launchExpectedFragmentAndFinish() {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY);
- verify(mFragment).openAccessibilityDetailsSettingsAndFinish(any());
+ assertStartActivityWithExpectedFragment(mActivity,
+ ToggleAccessibilityServicePreferenceFragment.class.getName());
+ verify(mActivity).finish();
}
@Test
- public void onCreate_hasInvalidExtraComponentName_shouldOpenAccessibilityServicesList() {
+ public void onCreate_hasInvalidExtraComponentName_launchAccessibilitySettingsAndFinish() {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, PACKAGE_NAME + "/.service");
doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY);
- verify(mFragment).openAccessibilitySettingsAndFinish();
+ assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+ verify(mActivity).finish();
}
@Test
- public void onCreate_hasNoExtraComponentName_shouldOpenAccessibilityServicesList() {
+ public void onCreate_hasNoExtraComponentName_launchAccessibilitySettingsAndFinish() {
final Intent intent = new Intent();
doReturn(intent).when(mActivity).getIntent();
mFragment.onCreate(Bundle.EMPTY);
- verify(mFragment).openAccessibilitySettingsAndFinish();
+ assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+ verify(mActivity).finish();
}
@Test
- public void onCreate_extraComponentNameIsDisallowed_shouldOpenAccessibilityServicesList() {
+ public void onCreate_extraComponentNameIsDisallowed_launchAccessibilitySettingsAndFinish() {
final Intent intent = new Intent();
intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
doReturn(intent).when(mActivity).getIntent();
@@ -116,7 +129,23 @@
mFragment.onCreate(Bundle.EMPTY);
- verify(mFragment).openAccessibilitySettingsAndFinish();
+ assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+ verify(mActivity).finish();
+ }
+
+ @Test
+ public void onCreate_magnificationComponentName_launchMagnificationFragmentAndFinish() {
+ final Intent intent = new Intent();
+ intent.putExtra(Intent.EXTRA_COMPONENT_NAME,
+ MAGNIFICATION_COMPONENT_NAME.flattenToString());
+ doReturn(intent).when(mActivity).getIntent();
+
+ mFragment.onCreate(Bundle.EMPTY);
+
+
+ assertStartActivityWithExpectedFragment(mActivity,
+ ToggleScreenMagnificationPreferenceFragment.class.getName());
+ verify(mActivity).finish();
}
private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
@@ -148,4 +177,11 @@
infoList.add(getMockAccessibilityServiceInfo());
return infoList;
}
+
+ private void assertStartActivityWithExpectedFragment(Context mockContext, String fragmentName) {
+ verify(mockContext).startActivity(mIntentArgumentCaptor.capture());
+ assertThat(mIntentArgumentCaptor.getValue()
+ .getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(fragmentName);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ForceBoldTextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
similarity index 71%
rename from tests/robotests/src/com/android/settings/accessibility/ForceBoldTextPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
index 46e1f48..eb49edd 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ForceBoldTextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
@@ -32,20 +32,20 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
-public class ForceBoldTextPreferenceControllerTest {
- private static final int ON = 2;
- private static final int OFF = 1;
- private static final int UNKNOWN = 0;
+public class FontWeightAdjustmentPreferenceControllerTest {
+ private static final int ON = FontWeightAdjustmentPreferenceController.BOLD_TEXT_ADJUSTMENT;
+ private static final int OFF = 0;
private Context mContext;
private SwitchPreference mPreference;
- private ForceBoldTextPreferenceController mController;
+ private FontWeightAdjustmentPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
- mController = new ForceBoldTextPreferenceController(mContext, "force_bold_text");
+ mController = new FontWeightAdjustmentPreferenceController(
+ mContext, "font_weight_adjustment");
}
@Test
@@ -55,9 +55,9 @@
}
@Test
- public void isChecked_enabledTextContrast_shouldReturnTrue() {
+ public void isChecked_enabledBoldText_shouldReturnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT, ON);
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, ON);
mController.updateState(mPreference);
@@ -66,9 +66,9 @@
}
@Test
- public void isChecked_disabledTextContrast_shouldReturnFalse() {
+ public void isChecked_disabledBoldText_shouldReturnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT, OFF);
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF);
mController.updateState(mPreference);
@@ -77,19 +77,18 @@
}
@Test
- public void setChecked_setTrue_shouldEnableTextContrast() {
+ public void setChecked_setTrue_shouldEnableBoldText() {
mController.setChecked(true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT, UNKNOWN)).isEqualTo(ON);
-
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(ON);
}
@Test
- public void setChecked_setFalse_shouldDisableTextContrast() {
+ public void setChecked_setFalse_shouldDisableBoldText() {
mController.setChecked(false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.FORCE_BOLD_TEXT, UNKNOWN)).isEqualTo(OFF);
+ Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(OFF);
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 9a157fe..6c62f19 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,7 +16,7 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
import static com.google.common.truth.Truth.assertThat;
@@ -62,6 +62,7 @@
private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+ private static final String PLACEHOLDER_DIALOG_TITLE = "title";
private static final String SOFTWARE_SHORTCUT_KEY =
Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
@@ -88,7 +89,7 @@
@Test
public void createFragment_shouldOnlyAddPreferencesOnce() {
FragmentController.setupFragment(mFragment, FragmentActivity.class,
- /* containerViewId= */ 0, /* bundle= */null);
+ /* containerViewId= */ 0, /* bundle= */ null);
// execute exactly once
verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
@@ -100,8 +101,10 @@
mFragment.updateShortcutPreferenceData();
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
// Compare to default UserShortcutType
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
}
@Test
@@ -112,8 +115,9 @@
putStringIntoSettings(HARDWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
mFragment.updateShortcutPreferenceData();
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
}
@Test
@@ -125,28 +129,70 @@
putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
mFragment.updateShortcutPreferenceData();
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.HARDWARE);
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE);
+ }
+
+ @Test
+ public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+ mContext.setTheme(R.style.Theme_AppCompat);
+ final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+ final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+ null);
+ mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+ mFragment.mShortcutPreference = shortcutPreference;
+
+ mFragment.mShortcutPreference.setChecked(false);
+ mFragment.setupEditShortcutDialog(dialog);
+
+ final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+ assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+ }
+
+ @Test
+ public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+ mContext.setTheme(R.style.Theme_AppCompat);
+ final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+ final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+ null);
+ final PreferredShortcut hardwareShortcut = new PreferredShortcut(
+ PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+ mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+ mFragment.mShortcutPreference = shortcutPreference;
+
+ PreferredShortcuts.saveUserShortcutType(mContext, hardwareShortcut);
+ mFragment.mShortcutPreference.setChecked(true);
+ mFragment.setupEditShortcutDialog(dialog);
+
+ final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+ assertThat(checkboxValue).isEqualTo(UserShortcutType.HARDWARE);
}
@Test
@Config(shadows = ShadowFragment.class)
public void restoreValueFromSavedInstanceState_assignToVariable() {
mContext.setTheme(R.style.Theme_AppCompat);
- final String dialogTitle = "title";
final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
- mContext, dialogTitle, this::callEmptyOnClicked);
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
final Bundle savedInstanceState = new Bundle();
+ final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+ null);
mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+ mFragment.mShortcutPreference = shortcutPreference;
- savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
+ savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
mFragment.onCreate(savedInstanceState);
- mFragment.initializeDialogCheckBox(dialog);
- mFragment.updateUserShortcutType(true);
+ mFragment.setupEditShortcutDialog(dialog);
+ final int value = mFragment.getShortcutTypeCheckBoxValue();
+ mFragment.saveNonEmptyUserShortcutType(value);
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
-
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
}
private void putStringIntoSettings(String key, String componentName) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 5c0cb6d..3df6221 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -19,7 +19,7 @@
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
import static com.google.common.truth.Truth.assertThat;
@@ -62,6 +62,7 @@
PLACEHOLDER_PACKAGE_NAME + ".mock_a11y_service";
private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+ private static final String PLACEHOLDER_DIALOG_TITLE = "title";
private static final String SOFTWARE_SHORTCUT_KEY =
Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
@@ -162,8 +163,10 @@
public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
mFragment.updateShortcutPreferenceData();
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
// Compare to default UserShortcutType
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
}
@Test
@@ -172,8 +175,9 @@
setMagnificationTripleTapEnabled(/* enabled= */ true);
mFragment.updateShortcutPreferenceData();
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
}
@Test
@@ -184,27 +188,66 @@
putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
mFragment.updateShortcutPreferenceData();
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.TRIPLETAP);
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(UserShortcutType.TRIPLETAP);
+ }
+
+ @Test
+ public void setupMagnificationEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+ mContext.setTheme(R.style.Theme_AppCompat);
+ final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+ final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+ null);
+ mFragment.mShortcutPreference = shortcutPreference;
+
+ mFragment.mShortcutPreference.setChecked(false);
+ mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+ final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+ assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+ }
+
+ @Test
+ public void setupMagnificationEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+ mContext.setTheme(R.style.Theme_AppCompat);
+ final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+ final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+ null);
+ final PreferredShortcut tripletapShortcut = new PreferredShortcut(
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+ mFragment.mShortcutPreference = shortcutPreference;
+
+ PreferredShortcuts.saveUserShortcutType(mContext, tripletapShortcut);
+ mFragment.mShortcutPreference.setChecked(true);
+ mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+ final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+ assertThat(checkboxValue).isEqualTo(UserShortcutType.TRIPLETAP);
}
@Test
@Config(shadows = ShadowFragment.class)
public void restoreValueFromSavedInstanceState_assignToVariable() {
mContext.setTheme(R.style.Theme_AppCompat);
- final String dialogTitle = "title";
final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
- mContext, dialogTitle, this::callEmptyOnClicked);
+ mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
final Bundle savedInstanceState = new Bundle();
+ mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
- savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
+ UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
mFragment.onCreate(savedInstanceState);
- mFragment.initializeDialogCheckBox(dialog);
- mFragment.updateUserShortcutType(true);
+ mFragment.setupMagnificationEditShortcutDialog(dialog);
+ final int value = mFragment.getShortcutTypeCheckBoxValue();
+ mFragment.saveNonEmptyUserShortcutType(value);
- assertThat(mFragment.mUserShortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
-
+ final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+ MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+ assertThat(value).isEqualTo(6);
+ assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
}
private void putStringIntoSettings(String key, String componentName) {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 9e31ca1..3ea2756 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -276,6 +276,18 @@
}
@Test
+ public void onRadioButtonClicked_functionMtp_inAccessoryCombinationsMode_doNothing() {
+ final long function = UsbManager.FUNCTION_ACCESSORY | UsbManager.FUNCTION_AUDIO_SOURCE;
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
+ doReturn(UsbManager.FUNCTION_ACCESSORY).when(mUsbBackend).getCurrentFunctions();
+
+ mDetailsFunctionsController.mPreviousFunction = function;
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(function);
+ }
+
+ @Test
public void onRadioButtonClicked_clickSameButton_doNothing() {
mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
doReturn(UsbManager.FUNCTION_PTP).when(mUsbBackend).getCurrentFunctions();
diff --git a/tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index 03e684b..0758869 100644
--- a/tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
diff --git a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java
rename to tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
index a8104bd..9f16492 100644
--- a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime.locationtimezone;
import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
index a78499c..27a9859 100644
--- a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.location;
+package com.android.settings.datetime.locationtimezone;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
diff --git a/tests/robotests/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..f4e3e71
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class TranscodeGlobalTogglePreferenceControllerTest {
+
+ private static final String TRANSCODE_ENABLED_PROP_KEY = "persist.sys.fuse.transcode";
+
+ private TranscodeGlobalTogglePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ Context context = ApplicationProvider.getApplicationContext();
+ mController = new TranscodeGlobalTogglePreferenceController(context, "test_key");
+ }
+
+ @Test
+ public void isAvailable_shouldReturnTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isChecked_whenEnabled_shouldReturnTrue() {
+ SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, "true");
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_whenDisabled_shouldReturnTrue() {
+ SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, "false");
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_withTrue_shouldUpdateSystemProperty() {
+ // Simulate the UI being clicked.
+ mController.setChecked(true);
+
+ // Verify the system property was updated with the UI value.
+ assertThat(SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, false)).isTrue();
+ }
+
+ @Test
+ public void setChecked_withFalse_shouldUpdateSystemProperty() {
+ // Simulate the UI being clicked.
+ mController.setChecked(false);
+
+ // Verify the system property was updated with the UI value.
+ assertThat(SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, true)).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..f1fce9f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/transcode/TranscodeSkipAppsPreferenceControllerTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowPackageManager;
+
+import java.util.Collections;
+
+@RunWith(RobolectricTestRunner.class)
+public class TranscodeSkipAppsPreferenceControllerTest {
+
+ private static final int APPLICATION_UID = 1234;
+ private static final String SKIP_SELECTED_APPS_PROP_KEY =
+ "persist.sys.fuse.transcode_skip_uids";
+
+ @Mock
+ private PreferenceScreen mScreen;
+ private Context mContext;
+ private ShadowPackageManager mShadowPackageManager;
+ private TranscodeSkipAppsPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+ mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+ mController = new TranscodeSkipAppsPreferenceController(mContext, "test_key");
+ Preference preference = new Preference(mContext);
+
+ when(mScreen.getContext()).thenReturn(mContext);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
+ }
+
+ @Test
+ public void isAlwaysAvailable() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void display_hasLaunchAbleApps_shouldDisplay() {
+ Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+ launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ final ResolveInfo resolveInfo = new FakeResolveInfo(mContext);
+ ApplicationInfo applicationInfo = new ApplicationInfo();
+ applicationInfo.uid = APPLICATION_UID;
+ ActivityInfo activityInfo = new ActivityInfo();
+ activityInfo.applicationInfo = applicationInfo;
+ resolveInfo.activityInfo = activityInfo;
+ mShadowPackageManager.setResolveInfosForIntent(launcherIntent,
+ Collections.singletonList(resolveInfo));
+
+ mController.displayPreference(mScreen);
+
+ verify(mScreen, atLeastOnce()).addPreference(any(Preference.class));
+ }
+
+ @Test
+ public void preferenceChecked_shouldSkipApp() {
+ // First ensure that the app is not in skip list.
+ SystemProperties.set(SKIP_SELECTED_APPS_PROP_KEY, String.valueOf(-1));
+ SwitchPreference switchPreference = createPreference(/* defaultCheckedState = */ false);
+
+ switchPreference.performClick();
+
+ // Verify that the app is added to skip list.
+ assertThat(SystemProperties.get(SKIP_SELECTED_APPS_PROP_KEY)).contains(
+ String.valueOf(APPLICATION_UID));
+ }
+
+ @Test
+ public void preferenceUnchecked_shouldNotSkipApp() {
+ // First ensure that the app is in skip list.
+ SystemProperties.set(SKIP_SELECTED_APPS_PROP_KEY, String.valueOf(APPLICATION_UID));
+ SwitchPreference switchPreference = createPreference(/* defaultCheckedState = */ true);
+
+ switchPreference.performClick();
+
+ // Verify that the app is removed from skip list.
+ assertThat(SystemProperties.get(SKIP_SELECTED_APPS_PROP_KEY)).doesNotContain(
+ String.valueOf(APPLICATION_UID));
+ }
+
+ private SwitchPreference createPreference(boolean defaultCheckedState) {
+ SwitchPreference preference = new SwitchPreference(mContext);
+ preference.setTitle("Test Pref");
+ preference.setIcon(R.drawable.ic_settings_24dp);
+ preference.setKey(String.valueOf(APPLICATION_UID));
+ preference.setChecked(defaultCheckedState);
+ preference.setOnPreferenceChangeListener(mController);
+ return preference;
+ }
+
+ private static class FakeResolveInfo extends ResolveInfo {
+
+ private final Context mContext;
+
+ FakeResolveInfo(Context context) {
+ this.mContext = context;
+ }
+
+ @Override
+ public CharSequence loadLabel(PackageManager pm) {
+ return "TestName";
+ }
+
+ @Override
+ public Drawable loadIcon(PackageManager pm) {
+ return mContext.getDrawable(R.drawable.ic_settings_24dp);
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index bbab259..a854c04 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -42,6 +42,7 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@@ -293,7 +294,7 @@
final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
- verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+ verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
}
@Test
@@ -310,7 +311,7 @@
final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
- verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+ verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
}
@Test
@@ -330,7 +331,7 @@
final String signalStrengthString =
mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
- verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+ verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
}
@Test
@@ -394,8 +395,8 @@
mController.initialize();
- verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
- verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
+ verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
+ verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
}
@Test
@@ -405,7 +406,7 @@
mController.initialize();
- verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
+ verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 1548b42..405ea12 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -19,13 +19,20 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.PowerManager;
import android.provider.Settings;
+import com.android.internal.R;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
@@ -41,24 +48,41 @@
@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayAlwaysOnPreferenceControllerTest {
+ private static final String TEST_PACKAGE = "com.android.test";
+
@Mock
private AmbientDisplayConfiguration mConfig;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private PowerManager mPowerManager;
+ @Mock
+ private ApplicationInfo mApplicationInfo;
private Context mContext;
private ContentResolver mContentResolver;
private AmbientDisplayAlwaysOnPreferenceController mController;
- private boolean mCallbackInvoked;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mContentResolver = mContext.getContentResolver();
mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, "key");
mController.setConfig(mConfig);
- mController.setCallback(() -> mCallbackInvoked = true);
+
+ mApplicationInfo.uid = 1;
+ when(mContext.getString(R.string.config_defaultWellbeingPackage)).thenReturn(TEST_PACKAGE);
+
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(
+ TEST_PACKAGE, /* flag= */0);
+
+ doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
+ when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+ .thenReturn(false);
}
@Test
@@ -108,13 +132,6 @@
}
@Test
- public void onPreferenceChange_callback() {
- assertThat(mCallbackInvoked).isFalse();
- mController.setChecked(true);
- assertThat(mCallbackInvoked).isTrue();
- }
-
- @Test
public void isSliceableCorrectKey_returnsTrue() {
final AmbientDisplayAlwaysOnPreferenceController controller =
new AmbientDisplayAlwaysOnPreferenceController(mContext,
@@ -133,4 +150,39 @@
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
+
+ @Test
+ public void isAodSuppressedByBedtime_bedTimeModeOn_returnTrue() {
+ when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+ .thenReturn(true);
+
+ assertThat(AmbientDisplayAlwaysOnPreferenceController
+ .isAodSuppressedByBedtime(mContext)).isTrue();
+ }
+
+ @Test
+ public void isAodSuppressedByBedtime_bedTimeModeOff_returnFalse() {
+ assertThat(AmbientDisplayAlwaysOnPreferenceController
+ .isAodSuppressedByBedtime(mContext)).isFalse();
+ }
+
+ @Test
+ public void isAodSuppressedByBedtime_notFoundWellbeingPackage_returnFalse()
+ throws PackageManager.NameNotFoundException {
+ when(mPackageManager.getApplicationInfo(TEST_PACKAGE, /* flag= */0)).thenThrow(
+ new PackageManager.NameNotFoundException());
+
+ assertThat(AmbientDisplayAlwaysOnPreferenceController
+ .isAodSuppressedByBedtime(mContext)).isFalse();
+ }
+
+ @Test
+ public void getSummary_bedTimeModeOn_shouldReturnUnavailableSummary() {
+ when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+ .thenReturn(true);
+
+ final CharSequence summary = mController.getSummary();
+ assertThat(summary).isEqualTo(mContext.getString(
+ com.android.settings.R.string.aware_summary_when_bedtime_on));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
new file mode 100644
index 0000000..e62de08
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGestureEntrypointPreferenceControllerTest {
+
+ private static final String TEST_PKG_NAME = "test_pkg";
+ private static final String TEST_CLASS_NAME = "name";
+ private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+ .setPackage(TEST_PKG_NAME);
+
+ private Context mContext;
+ private ShadowPackageManager mPackageManager;
+ private EmergencyGestureEntrypointPreferenceController mController;
+ private static final String PREF_KEY = "gesture_emergency_button";
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+ mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+ }
+
+ @After
+ public void tearDown() {
+ SettingsShadowResources.reset();
+ }
+
+ @Test
+ public void constructor_hasCustomPackageConfig_shouldSetIntent() {
+ final ResolveInfo info = new ResolveInfo();
+ info.activityInfo = new ActivityInfo();
+ info.activityInfo.packageName = TEST_PKG_NAME;
+ info.activityInfo.name = TEST_CLASS_NAME;
+
+ mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
+
+ SettingsShadowResources.overrideResource(
+ R.bool.config_show_emergency_gesture_settings,
+ Boolean.TRUE);
+
+ SettingsShadowResources.overrideResource(
+ R.string.emergency_gesture_settings_package,
+ TEST_PKG_NAME);
+
+ mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+
+ assertThat(mController.mIntent).isNotNull();
+ }
+
+ @Test
+ public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
+ SettingsShadowResources.overrideResource(
+ R.bool.config_show_emergency_gesture_settings,
+ Boolean.TRUE);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
+ SettingsShadowResources.overrideResource(
+ R.bool.config_show_emergency_gesture_settings,
+ Boolean.FALSE);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
index f894394..08106d3 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
@@ -16,7 +16,8 @@
package com.android.settings.gestures;
-import static com.android.settings.gestures.EmergencyGesturePreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
@@ -24,9 +25,6 @@
import android.content.ContentResolver;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
@@ -39,22 +37,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class EmergencyGesturePreferenceControllerTest {
- private static final String TEST_PKG_NAME = "test_pkg";
- private static final String TEST_CLASS_NAME = "name";
- private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
- .setPackage(TEST_PKG_NAME);
-
private Context mContext;
private ContentResolver mContentResolver;
- private ShadowPackageManager mPackageManager;
private EmergencyGesturePreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button";
@@ -62,7 +52,6 @@
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
- mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
}
@@ -72,43 +61,21 @@
}
@Test
- public void constructor_hasCustomPackageConfig_shouldSetIntent() {
- final ResolveInfo info = new ResolveInfo();
- info.activityInfo = new ActivityInfo();
- info.activityInfo.packageName = TEST_PKG_NAME;
- info.activityInfo.name = TEST_CLASS_NAME;
-
- mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
-
+ public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
- SettingsShadowResources.overrideResource(
- R.string.emergency_gesture_settings_package,
- TEST_PKG_NAME);
-
- mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
-
- assertThat(mController.mIntent).isNotNull();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
- public void isAvailable_configIsTrue_shouldReturnTrue() {
- SettingsShadowResources.overrideResource(
- R.bool.config_show_emergency_gesture_settings,
- Boolean.TRUE);
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void isAvailable_configIsFalse_shouldReturnFalse() {
+ public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
- assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@@ -130,17 +97,7 @@
}
@Test
- public void isSliceableCorrectKey_returnsTrue() {
- final EmergencyGesturePreferenceController controller =
- new EmergencyGesturePreferenceController(mContext, PREF_KEY);
- assertThat(controller.isSliceable()).isTrue();
+ public void isSliceable_returnsFalse() {
+ assertThat(mController.isSliceable()).isFalse();
}
-
- @Test
- public void isSliceableIncorrectKey_returnsFalse() {
- final DoubleTapPowerPreferenceController controller =
- new DoubleTapPowerPreferenceController(mContext, "bad_key");
- assertThat(controller.isSliceable()).isFalse();
- }
-
}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
deleted file mode 100644
index a758a94..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class StorageSliceTest {
- private static final String USED_BYTES_TEXT = "test used bytes";
- private static final String SUMMARY_TEXT = "test summary";
-
- private Context mContext;
- private StorageSlice mStorageSlice;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
-
- // Set-up specs for SliceMetadata.
- SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-
- mStorageSlice = spy(new StorageSlice(mContext));
- }
-
- @Test
- public void getSlice_shouldBeCorrectSliceContent() {
- final PrivateStorageInfo info = new PrivateStorageInfo(100L, 600L);
- doReturn(info).when(mStorageSlice).getPrivateStorageInfo();
- doReturn(USED_BYTES_TEXT).when(mStorageSlice).getStorageUsedText(any());
- doReturn(SUMMARY_TEXT).when(mStorageSlice).getStorageSummaryText(any());
-
- final Slice slice = mStorageSlice.getSlice();
-
- final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
- assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_label));
-
- final SliceAction primaryAction = metadata.getPrimaryAction();
- final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
- R.drawable.ic_homepage_storage);
- assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index e519b9a..ca36f1f 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -363,43 +363,43 @@
@Test
public void checkResource_stringArrayLength() {
- String[] entryValues = mContext.getResources().getStringArray(
+ String[] entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_values);
assertEquals(4, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_no_lte_values);
assertEquals(2, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_cdma_only_lte_values);
assertEquals(2, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_tdscdma_values);
assertEquals(3, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_gsm_lte_values);
assertEquals(1, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_gsm_values);
assertEquals(2, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_except_lte_values);
assertEquals(2, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_values);
assertEquals(3, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.enabled_networks_values);
assertEquals(3, entryValues.length);
- entryValues = mContext.getResources().getStringArray(
+ entryValues = mController.getResourcesForSubId().getStringArray(
R.array.preferred_network_mode_values_world_mode);
assertEquals(3, entryValues.length);
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
index 598f30a..d107814 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
@@ -79,6 +79,9 @@
mCarrierConfig = new PersistableBundle();
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL, false);
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
+ mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
mQueryImsState.setEnabledByPlatform(true);
@@ -91,6 +94,8 @@
mController = spy(new Enhanced4gLtePreferenceController(mContext, "VoLTE"));
mController.init(SUB_ID);
doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
+ doReturn(true).when(mController).isCallStateIdle();
+ doReturn(1).when(mController).getMode();
mPreference.setKey(mController.getPreferenceKey());
}
@@ -106,6 +111,16 @@
}
@Test
+ public void getAvailabilityStatus_modeMismatch_returnUnavailable() {
+ doReturn(2).when(mController).getMode();
+
+ mController.init(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
public void getAvailabilityStatus_volteDisabled_returnUnavailable() {
mQueryImsState.setEnabledByPlatform(false);
@@ -115,11 +130,7 @@
@Test
public void updateState_configEnabled_prefEnabled() {
- mQueryImsState.setIsEnabledByUser(true);
mPreference.setEnabled(false);
- mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
- mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
- mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
mController.updateState(mPreference);
@@ -127,6 +138,16 @@
}
@Test
+ public void updateState_callStateNotIdle_prefDisabled() {
+ doReturn(false).when(mController).isCallStateIdle();
+ mPreference.setEnabled(true);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
public void updateState_configOn_prefChecked() {
mQueryImsState.setIsEnabledByUser(true);
mPreference.setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
index bcc82ba..c6d3868 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -86,8 +85,6 @@
@Test
public void onPreferenceChange_selectNV_returnNVMode() {
- doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
-
mController.onPreferenceChange(mPreference, Integer.toString(
TelephonyManager.CDMA_SUBSCRIPTION_NV));
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
index 1a7fd86..2352b0f 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -92,7 +91,6 @@
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE,
TelephonyManager.CDMA_ROAMING_MODE_ANY);
- doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
mController.onPreferenceChange(mPreference,
Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 09e4408..030bb80 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -55,6 +55,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
@@ -182,6 +183,7 @@
}
@Test
+ @Ignore
public void processAndValidatePasswordRequirements_minPasswordComplexityStricter_password() {
mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_SOMETHING);
@@ -295,6 +297,7 @@
}
@Test
+ @Ignore
public void processAndValidatePasswordRequirements_requirementsUpdateAccordingToMinComplexityAndUserInput_empty() {
mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_UNSPECIFIED);
@@ -307,6 +310,7 @@
}
@Test
+ @Ignore
public void processAndValidatePasswordRequirements_requirementsUpdateAccordingToMinComplexityAndUserInput_numeric() {
mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_UNSPECIFIED);
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index 294d05e..5c60001 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -88,7 +88,6 @@
mTestFragment.onAttach(mContext);
verify(controller).setConfig(any());
- verify(controller).setCallback(any());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 29a3797..93663bd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -18,7 +18,9 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@@ -32,6 +34,7 @@
import android.net.wifi.WifiEnterpriseConfig.Phase2;
import android.net.wifi.WifiManager;
import android.os.ServiceSpecificException;
+import android.security.Credentials;
import android.security.KeyStore;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -78,6 +81,10 @@
private KeyStore mKeyStore;
private View mView;
private Spinner mHiddenSettingsSpinner;
+ private Spinner mEapCaCertSpinner;
+ private Spinner mEapUserCertSpinner;
+ private String mUseSystemCertsString;
+ private String mDoNotProvideEapUserCertString;
private ShadowSubscriptionManager mShadowSubscriptionManager;
public WifiConfigController2 mController;
@@ -98,6 +105,9 @@
private static final String NUMBER_AND_CHARACTER_KEY = "123456abcd";
private static final String PARTIAL_NUMBER_AND_CHARACTER_KEY = "123456abc?";
private static final int DHCP = 0;
+ // Saved certificates
+ private static final String SAVED_CA_CERT = "saved CA cert";
+ private static final String SAVED_USER_CERT = "saved user cert";
@Before
public void setUp() {
@@ -108,6 +118,11 @@
mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
+ mEapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+ mEapUserCertSpinner = mView.findViewById(R.id.user_cert);
+ mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
+ mDoNotProvideEapUserCertString =
+ mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
ipSettingsSpinner.setSelection(DHCP);
mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
@@ -835,4 +850,75 @@
final WifiConfiguration wifiConfiguration = mController.getConfig();
assertThat(wifiConfiguration.carrierId).isEqualTo(carrierId);
}
+
+ @Test
+ public void loadCaCertificateValue_shouldPersistentAsDefault() {
+ setUpModifyingSavedCertificateConfigController(null, null);
+
+ assertThat(mEapCaCertSpinner.getSelectedItem()).isEqualTo(mUseSystemCertsString);
+ }
+
+ @Test
+ public void loadSavedCaCertificateValue_shouldBeCorrectValue() {
+ setUpModifyingSavedCertificateConfigController(SAVED_CA_CERT, null);
+
+ assertThat(mEapCaCertSpinner.getSelectedItem()).isEqualTo(SAVED_CA_CERT);
+ }
+
+ @Test
+ public void loadUserCertificateValue_shouldPersistentAsDefault() {
+ setUpModifyingSavedCertificateConfigController(null, null);
+
+ assertThat(mEapUserCertSpinner.getSelectedItem()).isEqualTo(mDoNotProvideEapUserCertString);
+ }
+
+ @Test
+ public void loadSavedUserCertificateValue_shouldBeCorrectValue() {
+ setUpModifyingSavedCertificateConfigController(null, SAVED_USER_CERT);
+
+ assertThat(mEapUserCertSpinner.getSelectedItem()).isEqualTo(SAVED_USER_CERT);
+ }
+
+ private void setUpModifyingSavedCertificateConfigController(String savedCaCertificate,
+ String savedUserCertificate) {
+ final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
+ final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+ mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
+ when(mWifiEntry.isSaved()).thenReturn(true);
+ when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+ when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
+ when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
+ when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.TLS);
+ if (savedCaCertificate != null) {
+ String[] savedCaCertificates = new String[]{savedCaCertificate};
+ when(mockWifiEnterpriseConfig.getCaCertificateAliases())
+ .thenReturn(savedCaCertificates);
+ when(mKeyStore.list(eq(Credentials.CA_CERTIFICATE), anyInt()))
+ .thenReturn(savedCaCertificates);
+ }
+ if (savedUserCertificate != null) {
+ String[] savedUserCertificates = new String[]{savedUserCertificate};
+ when(mockWifiEnterpriseConfig.getClientCertificateAlias())
+ .thenReturn(savedUserCertificate);
+ when(mKeyStore.list(eq(Credentials.USER_PRIVATE_KEY), anyInt()))
+ .thenReturn(savedUserCertificates);
+ }
+
+ mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+ WifiConfigUiBase2.MODE_MODIFY);
+
+ // Because Robolectric has a different behavior from normal flow.
+ //
+ // Normal flow:
+ // showSecurityFields start -> mEapMethodSpinner.setSelection
+ // -> showSecurityFields end -> mController.onItemSelected
+ //
+ // Robolectric flow:
+ // showSecurityFields start -> mEapMethodSpinner.setSelection
+ // -> mController.onItemSelected -> showSecurityFields end
+ //
+ // We need to add a redundant mEapMethodSpinner.setSelection here to verify whether the
+ // certificates are covered by mController.onItemSelected after showSecurityFields end.
+ mController.mEapMethodSpinner.setSelection(Eap.TLS);
+ }
}
diff --git a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index 7938a99..9b38e5b 100644
--- a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -19,11 +19,12 @@
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import android.content.res.Resources;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.android.settings.testutils.ResourcesUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,12 +43,8 @@
public void testNoProvisionStringFormattedCorrectly() {
final String operator = "test_operator";
- assertThat(resourceString("mobile_no_provisioning_url", operator))
+ assertThat(
+ ResourcesUtils.getResourcesString(mContext, "mobile_no_provisioning_url", operator))
.contains(operator);
}
-
- public String resourceString(String name, Object value) {
- final Resources res = mContext.getResources();
- return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()), value);
- }
}
diff --git a/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java b/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java
new file mode 100644
index 0000000..096084f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.ims;
+
+import android.content.Context;
+import android.telephony.ims.ImsException;
+
+/**
+ * Controller class for mock Wifi calling status for unit tests, copied it from
+ * {@link MockWifiCallingQueryImsState} which is existed in robotests.
+ */
+public class MockWfcQueryImsState extends WifiCallingQueryImsState {
+
+ private Boolean mIsTtyOnVolteEnabled;
+ private Boolean mIsEnabledOnPlatform;
+ private Boolean mIsProvisionedOnDevice;
+ private Boolean mIsServiceStateReady;
+ private Boolean mIsEnabledByUser;
+
+ /**
+ * Constructor
+ *
+ * @param context {@code Context}
+ * @param subId subscription's id
+ */
+ public MockWfcQueryImsState(Context context, int subId) {
+ super(context, subId);
+ }
+
+ public void setIsTtyOnVolteEnabled(boolean enabled) {
+ mIsTtyOnVolteEnabled = enabled;
+ }
+
+ @Override
+ boolean isTtyOnVolteEnabled(int subId) {
+ if (mIsTtyOnVolteEnabled != null) {
+ return mIsTtyOnVolteEnabled;
+ }
+ return super.isTtyOnVolteEnabled(subId);
+ }
+
+
+ public void setIsEnabledByPlatform(boolean isEnabled) {
+ mIsEnabledOnPlatform = isEnabled;
+ }
+
+ @Override
+ boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,
+ IllegalArgumentException {
+ if (mIsEnabledOnPlatform != null) {
+ return mIsEnabledOnPlatform;
+ }
+ return super.isEnabledByPlatform(subId);
+ }
+
+ public void setIsProvisionedOnDevice(boolean isProvisioned) {
+ mIsProvisionedOnDevice = isProvisioned;
+ }
+
+ @Override
+ boolean isProvisionedOnDevice(int subId) {
+ if (mIsProvisionedOnDevice != null) {
+ return mIsProvisionedOnDevice;
+ }
+ return super.isProvisionedOnDevice(subId);
+ }
+
+ public void setServiceStateReady(boolean isReady) {
+ mIsServiceStateReady = isReady;
+ }
+
+ @Override
+ public boolean isServiceStateReady(int subId) throws InterruptedException, ImsException,
+ IllegalArgumentException {
+ if (mIsServiceStateReady != null) {
+ return mIsServiceStateReady;
+ }
+ return super.isServiceStateReady(subId);
+ }
+
+ public void setIsEnabledByUser(boolean enabled) {
+ mIsEnabledByUser = enabled;
+ }
+
+ @Override
+ boolean isEnabledByUser(int subId) {
+ if (mIsEnabledByUser != null) {
+ return mIsEnabledByUser;
+ }
+ return super.isEnabledByUser(subId);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
similarity index 80%
rename from tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
index e20241b..282704d 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,22 +22,25 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.Looper;
+import android.telecom.TelecomManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.testutils.ResourcesUtils;
import org.junit.After;
import org.junit.Before;
@@ -45,18 +48,18 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public class DefaultSubscriptionControllerTest {
@Mock
private SubscriptionManager mManager;
@Mock
- private PreferenceScreen mScreen;
+ private TelecomManager mTelecomManager;
+ private PreferenceScreen mScreen;
+ private PreferenceManager mPreferenceManager;
private ListPreference mListPreference;
private Context mContext;
private DefaultSubscriptionController mController;
@@ -64,12 +67,21 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mManager);
+ when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+
final String key = "prefkey";
- mController = spy(new TestDefaultSubscriptionController(mContext, key));
- mListPreference = spy(new ListPreference(mContext));
- when(mScreen.findPreference(key)).thenReturn(mListPreference);
+ mController = new TestDefaultSubscriptionController(mContext, key);
+
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+ mPreferenceManager = new PreferenceManager(mContext);
+ mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+ mListPreference = new ListPreference(mContext);
+ mListPreference.setKey(key);
+ mScreen.addPreference(mListPreference);
}
@After
@@ -94,14 +106,14 @@
@Test
public void isCallingAccountBindToSubscription_invalidAccount_withoutCrash() {
- doReturn(null).when(mController).getPhoneAccount(any());
+ doReturn(null).when(mTelecomManager).getPhoneAccount(any());
mController.isCallingAccountBindToSubscription(null);
}
@Test
public void getLabelFromCallingAccount_invalidAccount_emptyString() {
- doReturn(null).when(mController).getPhoneAccount(any());
+ doReturn(null).when(mTelecomManager).getPhoneAccount(any());
assertThat(mController.getLabelFromCallingAccount(null)).isEqualTo("");
}
@@ -111,7 +123,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -124,7 +136,8 @@
assertThat(entries.length).isEqualTo(3);
assertThat(entries[0]).isEqualTo("sub1");
assertThat(entries[1]).isEqualTo("sub2");
- assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
+ assertThat(entries[2]).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entryValues.length).isEqualTo(3);
@@ -139,7 +152,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub2.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -152,7 +165,8 @@
assertThat(entries.length).isEqualTo(3);
assertThat(entries[0]).isEqualTo("sub1");
assertThat(entries[1]).isEqualTo("sub2");
- assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
+ assertThat(entries[2]).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entryValues.length).isEqualTo(3);
@@ -172,7 +186,7 @@
when(sub2.isOpportunistic()).thenReturn(true);
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -180,7 +194,8 @@
assertThat(entries.length).isEqualTo(3);
assertThat(entries[0]).isEqualTo("sub1");
assertThat(entries[1]).isEqualTo("sub3");
- assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
+ assertThat(entries[2]).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entryValues.length).isEqualTo(3);
@@ -195,12 +210,12 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
mListPreference.setValue("222");
mController.onPreferenceChange(mListPreference, "222");
- verify(mController).setDefaultSubscription(eq(222));
+ assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222);
}
@Test
@@ -208,14 +223,14 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
mListPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
mController.onPreferenceChange(mListPreference,
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
- verify(mController).setDefaultSubscription(
- eq(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+ assertThat(mController.getDefaultSubscriptionId()).isEqualTo(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
}
@Test
@@ -225,7 +240,7 @@
// Start with only one sub active, so the pref is not available
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isFalse();
@@ -233,11 +248,12 @@
// Now make two subs be active - the pref should become available, and the
// onPreferenceChange callback should be properly wired up.
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+
mController.onSubscriptionsChanged();
+
assertThat(mController.isAvailable()).isTrue();
- assertThat(mListPreference.getOnPreferenceChangeListener()).isEqualTo(mController);
mListPreference.callChangeListener("222");
- verify(mController).setDefaultSubscription(eq(222));
+ assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222);
}
@Test
@@ -245,15 +261,15 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
- assertThat( mListPreference.getEntry()).isEqualTo("sub1");
+ assertThat(mListPreference.getEntry()).isEqualTo("sub1");
assertThat(mListPreference.getValue()).isEqualTo("111");
- doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub2.getSubscriptionId());
mController.onSubscriptionsChanged();
- assertThat( mListPreference.getEntry()).isEqualTo("sub2");
+ assertThat(mListPreference.getEntry()).isEqualTo("sub2");
assertThat(mListPreference.getValue()).isEqualTo("222");
}
@@ -262,7 +278,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isTrue();
@@ -280,7 +296,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isFalse();
@@ -299,7 +315,7 @@
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
final SubscriptionInfo sub3 = createMockSub(333, "sub3");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
- doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
+ mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mListPreference.getEntries().length).isEqualTo(3);
@@ -316,7 +332,7 @@
assertThat(entries[1].toString()).isEqualTo("sub2");
assertThat(entries[2].toString()).isEqualTo("sub3");
assertThat(entries[3].toString()).isEqualTo(
- mContext.getString(R.string.calls_and_sms_ask_every_time));
+ ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
assertThat(entryValues[0].toString()).isEqualTo("111");
assertThat(entryValues[1].toString()).isEqualTo("222");
assertThat(entryValues[2].toString()).isEqualTo("333");
@@ -332,8 +348,9 @@
}
private class TestDefaultSubscriptionController extends DefaultSubscriptionController {
+ int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- public TestDefaultSubscriptionController(Context context, String preferenceKey) {
+ TestDefaultSubscriptionController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -344,11 +361,12 @@
@Override
protected int getDefaultSubscriptionId() {
- return 0;
+ return mSubId;
}
@Override
protected void setDefaultSubscription(int subscriptionId) {
+ mSubId = subscriptionId;
}
}
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
similarity index 79%
rename from tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
index 38223b8..b269660 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
*/
package com.android.settings.network.telephony;
@@ -20,13 +20,17 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.Looper;
import android.telephony.SubscriptionManager;
-import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -35,10 +39,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public class DisabledSubscriptionControllerTest {
private static final String KEY = "disabled_subscription_category";
@@ -47,22 +49,28 @@
@Mock
private SubscriptionManager mSubscriptionManager;
@Mock
- private PreferenceScreen mScreen;
+ private Lifecycle mLifecycle;
+ private PreferenceScreen mScreen;
+ private PreferenceManager mPreferenceManager;
private PreferenceCategory mCategory;
private Context mContext;
- private Lifecycle mLifecycle;
private DisabledSubscriptionController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- LifecycleOwner lifecycleOwner = () -> mLifecycle;
- mLifecycle = new Lifecycle(lifecycleOwner);
- doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+ mPreferenceManager = new PreferenceManager(mContext);
+ mScreen = mPreferenceManager.createPreferenceScreen(mContext);
mCategory = new PreferenceCategory(mContext);
- doReturn(mCategory).when(mScreen).findPreference(KEY);
+ mCategory.setKey(KEY);
+ mScreen.addPreference(mCategory);
+
mController = new DisabledSubscriptionController(mContext, KEY);
mController.init(mLifecycle, SUB_ID);
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
index 95f1ee1..2b812c7 100644
--- a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
@@ -32,7 +32,6 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.telephony.CarrierConfigManager;
import android.telephony.ims.ProvisioningManager;
@@ -53,6 +52,7 @@
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SlicesFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.ResourcesUtils;
import org.junit.Before;
import org.junit.Ignore;
@@ -203,7 +203,8 @@
// Check the title
final List<SliceItem> sliceItems = slice.getItems();
- assertTitle(sliceItems, resourceString("enhanced_4g_lte_mode_title"));
+ assertTitle(sliceItems,
+ ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
}
private void testEnhanced4gLteSettingsToggleSlice(Slice slice) {
@@ -228,7 +229,8 @@
// Check the title
final List<SliceItem> sliceItems = slice.getItems();
- assertTitle(sliceItems, resourceString("enhanced_4g_lte_mode_title"));
+ assertTitle(sliceItems,
+ ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
}
private PendingIntent getBroadcastIntent(String action) {
@@ -287,9 +289,4 @@
return mQueryImsState;
}
}
-
- public String resourceString(String name) {
- final Resources res = mContext.getResources();
- return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()));
- }
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 0feabf2..cf4eb91 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.content.res.Resources;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -40,6 +39,8 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
+import com.android.settings.testutils.ResourcesUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -169,8 +170,9 @@
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse();
- assertThat(mPreference.getSummary())
- .isEqualTo(resourceString("mobile_data_settings_summary_auto_switch"));
+ assertThat(mPreference.getSummary()).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext,
+ "mobile_data_settings_summary_auto_switch"));
}
@Test
@@ -181,12 +183,7 @@
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isTrue();
- assertThat(mPreference.getSummary())
- .isEqualTo(resourceString("mobile_data_settings_summary"));
- }
-
- public String resourceString(String name) {
- final Resources res = mContext.getResources();
- return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()));
+ assertThat(mPreference.getSummary()).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext, "mobile_data_settings_summary"));
}
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index ee8157d..9c0a082 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -17,10 +17,13 @@
package com.android.settings.network.telephony;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -31,9 +34,13 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -42,6 +49,7 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.android.settings.network.ims.MockWfcQueryImsState;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import org.junit.Before;
@@ -79,11 +87,18 @@
private ResolveInfo mResolveInfo;
@Mock
private CarrierConfigManager mCarrierConfigManager;
+ @Mock
+ private ConnectivityManager mConnectivityManager;
+ @Mock
+ private TelecomManager mTelecomManager;
private Context mContext;
private PersistableBundle mCarrierConfig;
private PhoneAccountHandle mPhoneAccountHandle;
private ComponentName mComponentName;
+ private NetworkCapabilities mNetworkCapabilities;
+ private Network mNetwork;
+ private MockWfcQueryImsState mMockQueryWfcState;
@Before
public void setUp() {
@@ -92,7 +107,6 @@
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
- when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
@@ -103,6 +117,10 @@
mCarrierConfig = new PersistableBundle();
when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
+ mNetwork = new Network(anyInt());
+ when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+ when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
+
when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
when(mSubscriptionInfo1.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_1);
when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
@@ -115,6 +133,11 @@
when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
PLMN_FROM_TELEPHONY_MANAGER_API);
+
+ when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+ when(mTelecomManager.getSimCallManagerForSubscription(SUB_ID_1))
+ .thenReturn(mPhoneAccountHandle);
+ mMockQueryWfcState = new MockWfcQueryImsState(mContext, SUB_ID_1);
}
@Test
@@ -148,8 +171,7 @@
@Test
public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
- when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
- .thenReturn(new ArrayList<>());
+ buildPhoneAccountConfigureIntent(false);
assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
mPhoneAccountHandle)).isNull();
@@ -157,10 +179,7 @@
@Test
public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
- mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
- mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
- when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
- .thenReturn(Arrays.asList(mResolveInfo));
+ buildPhoneAccountConfigureIntent(true);
assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
mPhoneAccountHandle)).isNotNull();
@@ -333,4 +352,71 @@
assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
mContext)).isNotNull();
}
+
+ @Test
+ public void isCellularNetwork_withCellularNetwork_returnTrue() {
+ addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+
+ assertTrue(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+ }
+
+ @Test
+ public void isCellularNetwork_withWifiNetwork_returnFalse() {
+ addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+
+ assertFalse(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+ }
+
+ private void addNetworkTransportType (int networkType) {
+ mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
+ when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
+ mNetworkCapabilities);
+ }
+
+ @Test
+ public void isWifiCallingEnabled_hasPhoneAccountHandleAndHasActivityHandleIntent_returnTrue() {
+ buildPhoneAccountConfigureIntent(true);
+
+ assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+ null, mPhoneAccountHandle));
+ }
+
+ @Test
+ public void isWifiCallingEnabled_hasPhoneAccountHandleAndNoActivityHandleIntent_returnFalse() {
+ buildPhoneAccountConfigureIntent(false);
+
+ assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+ null, mPhoneAccountHandle));
+ }
+
+ @Test
+ public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingIsReady_returnTrue() {
+ setWifiCallingEnabled(true);
+
+ assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+ mMockQueryWfcState, null));
+ }
+
+ @Test
+ public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingNotReady_returnFalse() {
+ setWifiCallingEnabled(false);
+
+ assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+ mMockQueryWfcState, null));
+ }
+
+ private void setWifiCallingEnabled(boolean enabled){
+ mMockQueryWfcState.setIsEnabledByUser(enabled);
+ mMockQueryWfcState.setServiceStateReady(enabled);
+ mMockQueryWfcState.setIsEnabledByPlatform(enabled);
+ mMockQueryWfcState.setIsProvisionedOnDevice(enabled);
+ }
+
+ private void buildPhoneAccountConfigureIntent(boolean hasActivityHandleIntent) {
+ mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
+ mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
+ when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+ .thenReturn(
+ hasActivityHandleIntent ? Arrays.asList(mResolveInfo) : new ArrayList<>());
+ }
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
index f975055..c5da3c5 100644
--- a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -38,8 +38,8 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+import com.android.settings.testutils.ResourcesUtils;
import org.junit.After;
import org.junit.Before;
@@ -73,7 +73,8 @@
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
- when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+ when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+ mCarrierConfigManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
@@ -91,7 +92,7 @@
@After
public void tearDown() {
Settings.Global.putInt(
- mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
+ mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
}
@Test
@@ -142,7 +143,8 @@
assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
assertThat(mPreference.getSummary()).isEqualTo(
- resourceString("preferred_network_mode_tdscdma_gsm_wcdma_summary"));
+ ResourcesUtils.getResourcesString(mContext,
+ "preferred_network_mode_tdscdma_gsm_wcdma_summary"));
}
@Test
@@ -161,7 +163,7 @@
@Test
public void onPreferenceChange_updateFail() {
doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
- getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+ getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
mController.onPreferenceChange(mPreference,
String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
@@ -170,12 +172,4 @@
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
}
-
- public int resourceId(String type, String name) {
- return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
- }
-
- public String resourceString(String name) {
- return mContext.getResources().getString(resourceId("string", name));
- }
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
index f0f34d1..d888c9e 100644
--- a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -81,8 +80,6 @@
@Test
public void onPreferenceChange_selectNV_returnNVMode() {
- doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
-
mController.onPreferenceChange(mPreference, Integer.toString(
TelephonyManager.CDMA_SUBSCRIPTION_NV));
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
index 4f44a29..3bc3935 100644
--- a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -94,7 +93,6 @@
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE,
TelephonyManager.CDMA_ROAMING_MODE_ANY);
- doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
mController.onPreferenceChange(mPreference,
Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
index 1364b24..a97be94 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
@@ -36,6 +36,8 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.android.settings.testutils.ResourcesUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -128,7 +130,7 @@
assertThat(mSwitchPreference.isEnabled()).isFalse();
assertThat(mSwitchPreference.getSummary()).isEqualTo(
- resourceString("manual_mode_disallowed_summary",
+ ResourcesUtils.getResourcesString(mContext, "manual_mode_disallowed_summary",
mTelephonyManager.getSimOperatorName()));
}
@@ -139,12 +141,4 @@
// Should not crash
mController.init(mLifecycle, SUB_ID);
}
-
- public int resourceId(String type, String name) {
- return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
- }
-
- public String resourceString(String name, Object value) {
- return mContext.getResources().getString(resourceId("string", name), value);
- }
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
index c204e0e..0d20140 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -34,6 +34,8 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.android.settings.testutils.ResourcesUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -118,14 +120,7 @@
public void getSummary_notInService_returnDisconnect() {
when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
- assertThat(mController.getSummary()).isEqualTo(resourceString("network_disconnected"));
- }
-
- public int resourceId(String type, String name) {
- return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
- }
-
- public String resourceString(String name) {
- return mContext.getResources().getString(resourceId("string", name));
+ assertThat(mController.getSummary()).isEqualTo(
+ ResourcesUtils.getResourcesString(mContext, "network_disconnected"));
}
}
diff --git a/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
new file mode 100644
index 0000000..636954d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+
+public final class ResourcesUtils {
+ public static int getResourcesId(Context context, String type, String name) {
+ return context.getResources().getIdentifier(name, type, context.getPackageName());
+ }
+
+ public static String getResourcesString(Context context, String name) {
+ return context.getResources().getString(getResourcesId(context, "string", name));
+ }
+
+ public static String getResourcesString(Context context, String name, Object value) {
+ return context.getResources().getString(getResourcesId(context, "string", name), value);
+ }
+}