Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 44a2d54..a6b191b 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -341,7 +341,7 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"Stel volgens program"</item>
+ <item msgid="3880932435325583041">"Stel volgens app"</item>
<item msgid="8719204526359229387">"Wit op swart"</item>
<item msgid="5410164687403735103">"Swart op wit"</item>
<item msgid="1119043472912497241">"Geel op swart"</item>
@@ -473,7 +473,7 @@
<!-- no translation found for rtt_setting_mode:3 (7725394146877517088) -->
<string-array name="nfc_payment_favor">
<item msgid="9104058551372383947">"Altyd"</item>
- <item msgid="5283665583617307336">"Behalwe wanneer \'n ander betalingprogram oop is"</item>
+ <item msgid="5283665583617307336">"Behalwe wanneer \'n ander betaalapp oop is"</item>
</string-array>
<string-array name="nfc_payment_favor_values">
<item msgid="2373999996715432397">"0"</item>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 54af56f..26599b1 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -124,12 +124,12 @@
<item msgid="6215795691318745695">"አይለወጤ"</item>
</string-array>
<string-array name="wifi_proxy_settings">
- <item msgid="4669222334822978847">"አንዱም"</item>
+ <item msgid="4669222334822978847">"ምንም"</item>
<item msgid="6242198071587397280">"መመሪያ"</item>
<item msgid="464383874780058242">"የተኪ ራስ-ውቅር"</item>
</string-array>
<string-array name="apn_auth_entries">
- <item msgid="2900892411844440682">"አንዱም"</item>
+ <item msgid="2900892411844440682">"ምንም"</item>
<item msgid="3391314878583432149">"PAP"</item>
<item msgid="5548769169086098722">"CHAP"</item>
<item msgid="5845194685644699724">"PAP ወይም CHAP"</item>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 81a2d93..f92bfe5 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -341,7 +341,7 @@
<item msgid="3237802033158517495">"٪۱۰۰"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"تم ضبط الإعداد من جانب التطبيق."</item>
+ <item msgid="3880932435325583041">"تم ضبط الإعداد من جانب التطبيق"</item>
<item msgid="8719204526359229387">"أبيض في أسود"</item>
<item msgid="5410164687403735103">"أسود في أبيض"</item>
<item msgid="1119043472912497241">"أصفر في أسود"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 9ea9033..5928e1c 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -346,7 +346,7 @@
<item msgid="5410164687403735103">"Черно върху бяло"</item>
<item msgid="1119043472912497241">"Жълто върху черно"</item>
<item msgid="2836895041823327816">"Жълто върху синьо"</item>
- <item msgid="747238414788976867">"Персонализиран"</item>
+ <item msgid="747238414788976867">"Персонализ."</item>
</string-array>
<string-array name="accessibility_button_location_selector_titles">
<item msgid="6485511780196327736">"Плаващ елемент над други приложения"</item>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d64ed2b..fc9f50f 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -120,7 +120,7 @@
<item msgid="6686694694122598353">"GTC"</item>
</string-array>
<string-array name="wifi_ip_settings">
- <item msgid="6665889765350160154">"Protocolo DHCP"</item>
+ <item msgid="6665889765350160154">"DHCP"</item>
<item msgid="6215795691318745695">"IP estática"</item>
</string-array>
<string-array name="wifi_proxy_settings">
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index cf4a036..cee4b42 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -91,7 +91,7 @@
<item msgid="6702740528496186521">"5"</item>
</string-array>
<string-array name="bluetooth_audio_routing_titles">
- <item msgid="3488687531285795335">"Erabili aplikazioaren hobespen lehenetsiak"</item>
+ <item msgid="3488687531285795335">"Erabili aplikazioen balio lehenetsiak"</item>
<item msgid="5112879855377353813">"Erreproduzitu entzumen-gailuan"</item>
<item msgid="4853360663119482646">"Erreproduzitu telefonoaren bozgorailuan"</item>
</string-array>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 9cc1a65..7c63e31 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -258,7 +258,7 @@
<item msgid="8997371825401751421">"सेटिंग बदलें"</item>
<item msgid="7005755175240764443">"ऊपर बनाएं"</item>
<item msgid="8267704990417682222">"सूचना पाएं"</item>
- <item msgid="3180676986290096851">"कैमरा"</item>
+ <item msgid="3180676986290096851">"Camera"</item>
<item msgid="9174072114281872917">"ऑडियो रिकॉर्ड करें"</item>
<item msgid="1444183972646890539">"ऑडियो चलाएं"</item>
<item msgid="4337542044275236638">"क्लिपबोर्ड पढ़ें"</item>
@@ -341,7 +341,7 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"ऐप्लिकेशन के हिसाब से सेट करें"</item>
+ <item msgid="3880932435325583041">"ऐप, अपने हिसाब से कैप्शन सेट करे"</item>
<item msgid="8719204526359229387">"काले पर सफ़ेद"</item>
<item msgid="5410164687403735103">"सफ़ेद पर काला"</item>
<item msgid="1119043472912497241">"काले पर पीला"</item>
@@ -473,7 +473,7 @@
<!-- no translation found for rtt_setting_mode:3 (7725394146877517088) -->
<string-array name="nfc_payment_favor">
<item msgid="9104058551372383947">"हमेशा"</item>
- <item msgid="5283665583617307336">"दूसरा ऐप्लिकेशन खुला होने पर इसका इस्तेमाल नहीं किया जाएगा"</item>
+ <item msgid="5283665583617307336">"पेमेंट के लिए दूसरा ऐप्लिकेशन खुला होने पर इसका इस्तेमाल न करें"</item>
</string-array>
<string-array name="nfc_payment_favor_values">
<item msgid="2373999996715432397">"0"</item>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 426408a..745ccf3 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -320,11 +320,11 @@
<item msgid="5012882784126308133">"Mala slova"</item>
</string-array>
<string-array name="captioning_font_size_selector_titles">
- <item msgid="923916134548435468">"Vrlo mali"</item>
- <item msgid="5738147437573674872">"Mali"</item>
- <item msgid="4691660235626027304">"Srednje"</item>
- <item msgid="824386705928670045">"Veliki"</item>
- <item msgid="2790561781512874585">"Vrlo veliki"</item>
+ <item msgid="923916134548435468">"Vrlo mala"</item>
+ <item msgid="5738147437573674872">"Mala"</item>
+ <item msgid="4691660235626027304">"Srednja"</item>
+ <item msgid="824386705928670045">"Velika"</item>
+ <item msgid="2790561781512874585">"Vrlo velika"</item>
</string-array>
<string-array name="captioning_edge_type_selector_titles">
<item msgid="70686029249840227">"Zadano"</item>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index cb568c3..4fb8497 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -341,11 +341,11 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"Կարգավորված է հավելվածով"</item>
+ <item msgid="3880932435325583041">"Ըստ հավելվածի"</item>
<item msgid="8719204526359229387">"Սպիտակ՝ սևի վրա"</item>
<item msgid="5410164687403735103">"Սև՝ սպիտակի վրա"</item>
<item msgid="1119043472912497241">"Դեղին՝ սևի վրա"</item>
- <item msgid="2836895041823327816">"Դեղինը կապույտի վրա"</item>
+ <item msgid="2836895041823327816">"Դեղին՝ կապույտի վրա"</item>
<item msgid="747238414788976867">"Հատուկ"</item>
</string-array>
<string-array name="accessibility_button_location_selector_titles">
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 84a063c..9b796ec 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -341,11 +341,11 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"Орнатқан қолданба:"</item>
+ <item msgid="3880932435325583041">"Қолданба орнатқан"</item>
<item msgid="8719204526359229387">"Қарада ақ"</item>
- <item msgid="5410164687403735103">"Ақ түсте қарамен"</item>
- <item msgid="1119043472912497241">"Қара түсте сарымен"</item>
- <item msgid="2836895041823327816">"Көк түсте сарымен"</item>
+ <item msgid="5410164687403735103">"Ақта қара"</item>
+ <item msgid="1119043472912497241">"Қарада сары"</item>
+ <item msgid="2836895041823327816">"Көкте сары"</item>
<item msgid="747238414788976867">"Басқа"</item>
</string-array>
<string-array name="accessibility_button_location_selector_titles">
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 8991e0f..6004a08 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -341,7 +341,7 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"ಆ್ಯಪ್ ಮೂಲಕ ಹೊಂದಿಸಿ"</item>
+ <item msgid="3880932435325583041">"ಆ್ಯಪ್ ಪ್ರಕಾರ ಸೆಟ್ ಮಾಡಿ"</item>
<item msgid="8719204526359229387">"ಕಪ್ಪು ಬಣ್ಣದಲ್ಲಿ ಬಿಳಿ"</item>
<item msgid="5410164687403735103">"ಬಿಳಿ ಬಣ್ಣದಲ್ಲಿ ಕಪ್ಪು"</item>
<item msgid="1119043472912497241">"ಕಪ್ಪು ಬಣ್ಣದಲ್ಲಿ ಹಳದಿ"</item>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index dfd367e..cd5dba5 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -343,7 +343,7 @@
<string-array name="captioning_preset_selector_titles">
<item msgid="3880932435325583041">"Ditetapkan oleh apl"</item>
<item msgid="8719204526359229387">"Putih pada hitam"</item>
- <item msgid="5410164687403735103">"Hitam pada putih"</item>
+ <item msgid="5410164687403735103">"Hitam berlatar putih"</item>
<item msgid="1119043472912497241">"Kuning pada hitam"</item>
<item msgid="2836895041823327816">"Kuning pada biru"</item>
<item msgid="747238414788976867">"Peribadi"</item>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index b152cc0..e07501a 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -341,7 +341,7 @@
<item msgid="3237802033158517495">"100%"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"ตั้งค่าตามแอป"</item>
+ <item msgid="3880932435325583041">"กำหนดโดยแอป"</item>
<item msgid="8719204526359229387">"สีขาวบนพื้นสีดำ"</item>
<item msgid="5410164687403735103">"สีดำบนพื้นสีขาว"</item>
<item msgid="1119043472912497241">"สีเหลืองบนพื้นสีดำ"</item>
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 461930b..c8617af 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -46,6 +46,7 @@
import com.android.internal.annotations.Initializer;
import com.android.internal.telephony.OperatorInfo;
+import com.android.internal.telephony.flags.Flags;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -437,6 +438,9 @@
*/
@VisibleForTesting
protected List<String> getSatellitePlmnsForCarrierWrapper() {
+ if (!Flags.carrierEnabledSatelliteFlag()) {
+ return new ArrayList<>();
+ }
return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
}