Merge "Import translations. DO NOT MERGE" into rvc-dev
diff --git a/res/layout/contextual_slice_full_tile.xml b/res/layout/contextual_slice_full_tile.xml
index b6ab410..01d4bd9 100644
--- a/res/layout/contextual_slice_full_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -27,7 +27,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
- style="@style/ContextualCardSliceViewStyle"
+ style="@style/Widget.SliceView.ContextualCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
diff --git a/res/layout/contextual_slice_sticky_tile.xml b/res/layout/contextual_slice_sticky_tile.xml
index 2e7a2be..e47c98d 100644
--- a/res/layout/contextual_slice_sticky_tile.xml
+++ b/res/layout/contextual_slice_sticky_tile.xml
@@ -25,7 +25,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
- style="@style/ContextualCardSliceViewStyle"
+ style="@style/Widget.SliceView.ContextualCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index 805d431..5dd53c0 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -51,6 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="9dp"
@@ -59,6 +60,8 @@
android:id="@+id/header_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
android:textColor="?android:attr/textColorPrimary"
android:textSize="20sp"/>
diff --git a/res/layout/panel_slice_row.xml b/res/layout/panel_slice_row.xml
index 74dc412..69a36f60 100644
--- a/res/layout/panel_slice_row.xml
+++ b/res/layout/panel_slice_row.xml
@@ -22,7 +22,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
- style="@style/SliceViewStyle"
+ style="@style/Widget.SliceView.Panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
diff --git a/res/layout/panel_slice_slider_row.xml b/res/layout/panel_slice_slider_row.xml
index c1c076c..a7659d3 100644
--- a/res/layout/panel_slice_slider_row.xml
+++ b/res/layout/panel_slice_slider_row.xml
@@ -23,7 +23,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
- style="@style/SliceViewSliderStyle"
+ style="@style/Widget.SliceView.Panel.Slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="0dp"
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index ec83165..20af93f 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -100,9 +100,9 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"عدم التحقق"</item>
- <item msgid="5703177653586269306">"طلب حالة الشهادة"</item>
+ <item msgid="5703177653586269306">"حالة الشهادة مطلوبة"</item>
<item msgid="326388247868439528">"طلب حالة الشهادة"</item>
- <item msgid="1090956283885790552">"طلب جميع حالات الشهادات غير الموثوقة"</item>
+ <item msgid="1090956283885790552">"جميع حالات الشهادات غير الموثوقة مطلوبة"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"زر الدفع"</item>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 7be6e43..f38dfdf 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"Безлімітная"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Выкарыстоўваць выпадковы MAC-адрас (стандартна)"</item>
+ <item msgid="3485945604919292489">"Выпадковы MAC-адрас (стандартна)"</item>
<item msgid="741680937828608749">"Выкарыстоўваць MAC-адрас прылады"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 7f7de44..0d1af9f 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -171,7 +171,7 @@
</string-array>
<string-array name="wifi_ip_settings">
<item msgid="6665889765350160154">"DHCP"</item>
- <item msgid="6215795691318745695">"Statički"</item>
+ <item msgid="6215795691318745695">"Statična IP adresa"</item>
</string-array>
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"Ništa"</item>
@@ -482,7 +482,7 @@
<item msgid="9080166583718385565">"0"</item>
</string-array>
<string-array name="wifi_metered_entries">
- <item msgid="3237321077949659241">"Detektiraj automatski"</item>
+ <item msgid="3237321077949659241">"Automatski otkrij"</item>
<item msgid="3779092145391320375">"Tretiraj kao vezu s naplatom"</item>
<item msgid="2047166446768045816">"Tretiraj kao vezu bez naplate"</item>
</string-array>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index d00f372..d71c115 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"Považovat za neměřenou síť"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Použít náhodně vygenerovanou adresu MAC (výchozí)"</item>
+ <item msgid="3485945604919292489">"Použít náhodnou MAC (výchozí)"</item>
<item msgid="741680937828608749">"Použít adresu MAC zařízení"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 1acd23d..cfec2e8 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -176,7 +176,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"Ingen"</item>
<item msgid="6242198071587397280">"Manuel"</item>
- <item msgid="464383874780058242">"Proxy Auto-Config"</item>
+ <item msgid="464383874780058242">"Automatisk proxykonfig."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="2900892411844440682">"Ingen"</item>
@@ -483,7 +483,7 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"Find automatisk"</item>
- <item msgid="3779092145391320375">"Håndter som forbrugsbaseret netværk"</item>
+ <item msgid="3779092145391320375">"Håndter som forbrugsafregnet netværk"</item>
<item msgid="2047166446768045816">"Håndter som ubegrænset netværk"</item>
</string-array>
<string-array name="wifi_privacy_entries">
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 300c2fc..4b9af63 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -102,7 +102,7 @@
<item msgid="7202884222741437608">"Nicht validieren"</item>
<item msgid="5703177653586269306">"Zertifikatstatus auf Anforderung"</item>
<item msgid="326388247868439528">"Zertifikatstatus erforderlich"</item>
- <item msgid="1090956283885790552">"Alle nicht vertrauenswürdigen Zertifikatstatus erforderlich"</item>
+ <item msgid="1090956283885790552">"Jeder nicht vertrauenswürdige Zertifikatstatus erforderlich"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Push-Schaltfläche"</item>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 1861a97..deff933 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -174,8 +174,8 @@
<item msgid="6215795691318745695">"Στατικό"</item>
</string-array>
<string-array name="wifi_proxy_settings">
- <item msgid="4669222334822978847">"Κανένα"</item>
- <item msgid="6242198071587397280">"Μη αυτόματες"</item>
+ <item msgid="4669222334822978847">"Κανένας"</item>
+ <item msgid="6242198071587397280">"Μη αυτόματος"</item>
<item msgid="464383874780058242">"Αυτ. διαμ.διακομ.μεσολ."</item>
</string-array>
<string-array name="apn_auth_entries">
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index b5e3105..e14c6af 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -100,9 +100,9 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"No validar"</item>
- <item msgid="5703177653586269306">"Solicita el estado de certificado"</item>
- <item msgid="326388247868439528">"Requiere el estado de certificado"</item>
- <item msgid="1090956283885790552">"Requiere todos los estados de certificados que no sean de confianza"</item>
+ <item msgid="5703177653586269306">"Solicitar estado del certificado"</item>
+ <item msgid="326388247868439528">"Exigir estado del certificado"</item>
+ <item msgid="1090956283885790552">"Exigir estados de cert. no de confianza"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Presionar botón"</item>
@@ -484,10 +484,10 @@
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"Detectar automáticamente"</item>
<item msgid="3779092145391320375">"Tratar como red de uso medido"</item>
- <item msgid="2047166446768045816">"Tratar como red sin tarifa plana"</item>
+ <item msgid="2047166446768045816">"Tratar como red de uso no medido"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Usar MAC aleatoria (predeterminada)"</item>
+ <item msgid="3485945604919292489">"Usar MAC aleatoria (pred.)"</item>
<item msgid="741680937828608749">"Usar MAC del dispositivo"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index eab29d7..8a8b7a5 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -100,9 +100,9 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"Ez balidatu"</item>
- <item msgid="5703177653586269306">"Eskatu ziurtagirien egoera"</item>
- <item msgid="326388247868439528">"Eskatu ziurtagirien egoera"</item>
- <item msgid="1090956283885790552">"Eskatu fidagarritzat jotzen ez diren ziurtagiri guztien egoera"</item>
+ <item msgid="5703177653586269306">"Eskatu ziurtagirien egoera emateko"</item>
+ <item msgid="326388247868439528">"Behartu ziurtagirien egoera ematera"</item>
+ <item msgid="1090956283885790552">"Behartu fidagarritzat jotzen ez diren ziurtagiri guztien egoera ematera"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Sakatu botoia"</item>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 21c432e..80b1eb8 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -463,11 +463,11 @@
<item msgid="8186970968968646288">"Välimuistissa (tyhjä)"</item>
</string-array>
<string-array name="color_picker">
- <item msgid="3230992859486877963">"Turkoosi"</item>
+ <item msgid="3230992859486877963">"Sinivihreä"</item>
<item msgid="5661027589207588703">"Sininen"</item>
<item msgid="3795787248113275442">"Indigo"</item>
<item msgid="6331809026622602308">"Violetti"</item>
- <item msgid="6390546163902724700">"Vaaleanpunainen"</item>
+ <item msgid="6390546163902724700">"Pinkki"</item>
<item msgid="6618900408138432102">"Punainen"</item>
</string-array>
<string-array name="automatic_storage_management_days">
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"Merkitse maksuttomaksi"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Käytä satunnaistettua MAC-osoitetta (oletus)"</item>
+ <item msgid="3485945604919292489">"Käytä satunnaistettua MACia (oletus)"</item>
<item msgid="741680937828608749">"Käytä laitteen MAC-osoitetta"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index ea243ad..ab844af 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -451,7 +451,7 @@
<item msgid="5777152116210127847">"ટોચની પ્રવૃત્તિ"</item>
<item msgid="1834030155560727324">"મહત્વપૂર્ણ (અગ્રભૂમિ)"</item>
<item msgid="8494424742994426350">"મહત્વપૂર્ણ (બૅકગ્રાઉન્ડ)"</item>
- <item msgid="5099332663422156149">"બેકઅપ"</item>
+ <item msgid="5099332663422156149">"બૅકઅપ"</item>
<item msgid="7701089238529887617">"ભારે વજન"</item>
<item msgid="3006466648960525485">"સેવા (ચાલે છે)"</item>
<item msgid="2253476667031759713">"સેવા (પુનઃપ્રારંભ થાય છે)"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index d0ff773..64fef8a 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -171,7 +171,7 @@
</string-array>
<string-array name="wifi_ip_settings">
<item msgid="6665889765350160154">"DHCP"</item>
- <item msgid="6215795691318745695">"स्थिर"</item>
+ <item msgid="6215795691318745695">"स्टैटिक"</item>
</string-array>
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"कोई नहीं"</item>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 3b2cd08..03891c6 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -131,11 +131,11 @@
<item msgid="6702740528496186521">"5"</item>
</string-array>
<string-array name="wifi_signal">
- <item msgid="199360311367724149">"Lélegt"</item>
- <item msgid="2470925506985305429">"Lélegt"</item>
- <item msgid="8545211062334016668">"Sæmilegt"</item>
+ <item msgid="199360311367724149">"Lélegur"</item>
+ <item msgid="2470925506985305429">"Lélegur"</item>
+ <item msgid="8545211062334016668">"Sæmilegur"</item>
<item msgid="7468449584777730187">"Góður"</item>
- <item msgid="202124107702016530">"Frábært"</item>
+ <item msgid="202124107702016530">"Frábær"</item>
</string-array>
<string-array name="data_usage_data_range">
<item msgid="3528385925116637939">"Síðustu 30 dagar"</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 682b00d..5d1e608 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -102,7 +102,7 @@
<item msgid="7202884222741437608">"Non convalidare"</item>
<item msgid="5703177653586269306">"Chiedi stato dei certificati"</item>
<item msgid="326388247868439528">"Richiedi stato dei certificati"</item>
- <item msgid="1090956283885790552">"Richiedi gli stati di tutti i certificati non attendibili"</item>
+ <item msgid="1090956283885790552">"Richiedi stati di tutti i certificati non attendibili"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Pulsante di comando"</item>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 4c82e08..e707aef 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -487,8 +487,8 @@
<item msgid="2047166446768045816">"定額制として扱う"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"ランダムな MAC を使用する（デフォルト）"</item>
- <item msgid="741680937828608749">"デバイスの MAC を使用する"</item>
+ <item msgid="3485945604919292489">"ランダム MAC を使用（デフォルト）"</item>
+ <item msgid="741680937828608749">"デバイスの MAC を使用"</item>
</string-array>
<string-array name="wifi_hidden_entries">
<item msgid="342232116597649254">"いいえ"</item>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 3265fa4..02d3940 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -102,7 +102,7 @@
<item msgid="7202884222741437608">"არ მსურს დადასტურება"</item>
<item msgid="5703177653586269306">"მოითხოვეთ სერტიფიკატის სტატუსი"</item>
<item msgid="326388247868439528">"მოითხოვეთ სერტიფიკატის სტატუსი"</item>
- <item msgid="1090956283885790552">"მოითხოვეთ ყველა არასანდო სერტიფიკატის სტატუსი"</item>
+ <item msgid="1090956283885790552">"მოითხოვეთ ყველა არასანდო სერტ. სტატუსები"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Push ღილაკი"</item>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 480888e..2c78dfb 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"무제한 Wi-Fi로 취급"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"임의의 MAC 사용(기본값)"</item>
+ <item msgid="3485945604919292489">"무작위 MAC 사용(기본값)"</item>
<item msgid="741680937828608749">"기기 MAC 사용"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 18cb337..b4cd422 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -500,7 +500,7 @@
</string-array>
<string-array name="autofill_logging_level_entries">
<item msgid="2263571982739726576">"Өчүк"</item>
- <item msgid="4295717421282345505">"Мүчүлүштүктөрдү оңдоо"</item>
+ <item msgid="4295717421282345505">"Мүчүлүштүктөрдү аныктоо"</item>
<item msgid="8657797891533816070">"Оозеки кирүү"</item>
</string-array>
<string-array name="cdma_system_select_choices">
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 2a248b4..fe95047 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -464,11 +464,11 @@
</string-array>
<string-array name="color_picker">
<item msgid="3230992859486877963">"ສີຂຽວອົມຟ້າ"</item>
- <item msgid="5661027589207588703">"ຟ້າ"</item>
+ <item msgid="5661027589207588703">"ສີຟ້າ"</item>
<item msgid="3795787248113275442">"ສີມ່ວງເຂັ້ມ"</item>
<item msgid="6331809026622602308">"ສີມ່ວງ"</item>
- <item msgid="6390546163902724700">"ບົວ"</item>
- <item msgid="6618900408138432102">"ແດງ"</item>
+ <item msgid="6390546163902724700">"ສີບົວ"</item>
+ <item msgid="6618900408138432102">"ສີແດງ"</item>
</string-array>
<string-array name="automatic_storage_management_days">
<item msgid="8896644025110620477">"ເກີນ 30 ມື້ແລ້ວ"</item>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index a4c9bdf..e88bf1e 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -100,9 +100,9 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"Не потврдувај"</item>
- <item msgid="5703177653586269306">"Барај статус на сертификатот"</item>
+ <item msgid="5703177653586269306">"Побарај статус на сертификатот"</item>
<item msgid="326388247868439528">"Статусот на сертификатот е задолжителен"</item>
- <item msgid="1090956283885790552">"Статусите за сите недоверливи сертификати се задолжителни"</item>
+ <item msgid="1090956283885790552">"Статусите на сите недоверливи сертификати се задолжителни"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Копче „Притисни“"</item>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index f1a759c..f395487 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -176,7 +176,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"कुनै पनि होइन"</item>
<item msgid="6242198071587397280">"म्यानुअल"</item>
- <item msgid="464383874780058242">"प्रोक्सी स्वतः समायोजन"</item>
+ <item msgid="464383874780058242">"प्रोक्सी अटो-कन्फिगुरेसन"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="2900892411844440682">"कुनै पनि होइन"</item>
@@ -484,7 +484,7 @@
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"स्वतः पत्ता लगाउनुहोस्"</item>
<item msgid="3779092145391320375">"सशुल्क वाइफाइका रूपमा लिनुहोस्"</item>
- <item msgid="2047166446768045816">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+ <item msgid="2047166446768045816">"नि:शुल्क वाइफाइको रूपमा लिनुहोस्"</item>
</string-array>
<string-array name="wifi_privacy_entries">
<item msgid="3485945604919292489">"क्रमरहित MAC प्रयोग गर्नुहोस् (पूर्वनिर्धारित)"</item>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 40737fc..ac2dacf 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -77,7 +77,7 @@
<item msgid="492518447401534767">"Połączono"</item>
<item msgid="4322989558568666518">"Zawieszona"</item>
<item msgid="286164147080824297">"Trwa rozłączanie..."</item>
- <item msgid="1628460745311787730">"Rozłączona"</item>
+ <item msgid="1628460745311787730">"Rozłączono"</item>
<item msgid="4013828218541488949">"Niepowodzenie"</item>
<item msgid="5473541238056528086">"Zablokowana"</item>
<item msgid="1114588261171522603">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
@@ -91,7 +91,7 @@
<item msgid="2227930004124157952">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
<item msgid="7104168043537022445">"Zawieszona"</item>
<item msgid="2595938203187002544">"Trwa rozłączanie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
- <item msgid="2435175968703898648">"Rozłączona"</item>
+ <item msgid="2435175968703898648">"Rozłączono"</item>
<item msgid="4804573668906374228">"Niepowodzenie"</item>
<item msgid="4036325515437530221">"Zablokowana"</item>
<item msgid="8883455894013518008">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index c17baf5..45ed818 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -101,7 +101,7 @@
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"Nu se validează"</item>
<item msgid="5703177653586269306">"Solicitați starea certificatelor"</item>
- <item msgid="326388247868439528">"Solicitați starea certificatelor"</item>
+ <item msgid="326388247868439528">"Solicitați obligatoriu starea certificatelor"</item>
<item msgid="1090956283885790552">"Solicitați toate stările certif. care nu prezintă încredere"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 0a21d43..27d593a 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -175,8 +175,8 @@
</string-array>
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"Нет"</item>
- <item msgid="6242198071587397280">"Вручную"</item>
- <item msgid="464383874780058242">"Автоконфигурация прокси"</item>
+ <item msgid="6242198071587397280">"Ручная настройка"</item>
+ <item msgid="464383874780058242">"Автоконфигурация"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="2900892411844440682">"Нет"</item>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index e9af5bc..5177ba0 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"Považovať za nemeranú sieť"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Používať randomizovanú adresu MAC (predvolené)"</item>
+ <item msgid="3485945604919292489">"Použiť náhodnú MAC (predvolené)"</item>
<item msgid="741680937828608749">"Používať adresu MAC zariadenia"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 8bca142..4d6be60 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"Obravnavaj kot: neomejen prenos podatkov"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Uporaba naključno izbranega naslova MAC (privzeto)"</item>
+ <item msgid="3485945604919292489">"Uporaba naključnega MAC (privzeto)"</item>
<item msgid="741680937828608749">"Uporaba naslova MAC naprave"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index ec85790..ef84754 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -487,7 +487,7 @@
<item msgid="2047166446768045816">"గణించబడనిదిగా పరిగణించండి"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"యాదృచ్ఛిక MAC అడ్రస్ని ఉపయోగించండి (డిఫాల్ట్)"</item>
+ <item msgid="3485945604919292489">"ర్యాండమ్గా రూపొందించిన MAC అడ్రస్ను ఉపయోగించండి (ఆటోమేటిక్)"</item>
<item msgid="741680937828608749">"పరికర MAC అడ్రస్ని ఉపయోగించండి"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b0805c0..89108ef 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -99,7 +99,7 @@
<!-- no translation found for wifi_tether_security:0 (6312112980634811065) -->
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
- <item msgid="7202884222741437608">"Doğrulama"</item>
+ <item msgid="7202884222741437608">"Doğrulama yapma"</item>
<item msgid="5703177653586269306">"Sertifika durumunu iste"</item>
<item msgid="326388247868439528">"Sertifika durumunu gerektir"</item>
<item msgid="1090956283885790552">"Tüm güvenilmeyen sertifika durumlarını gerektir"</item>
@@ -175,7 +175,7 @@
</string-array>
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"Yok"</item>
- <item msgid="6242198071587397280">"El ile"</item>
+ <item msgid="6242198071587397280">"Manuel"</item>
<item msgid="464383874780058242">"Proxy Otomatik Yapılandırması"</item>
</string-array>
<string-array name="apn_auth_entries">
@@ -483,8 +483,8 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"Otomatik olarak algıla"</item>
- <item msgid="3779092145391320375">"Sınırlı olarak ele al"</item>
- <item msgid="2047166446768045816">"Sınırsız olarak ele al"</item>
+ <item msgid="3779092145391320375">"Sınırlı gibi kullan"</item>
+ <item msgid="2047166446768045816">"Sınırsız gibi kullan"</item>
</string-array>
<string-array name="wifi_privacy_entries">
<item msgid="3485945604919292489">"Rastgele MAC kullan (varsayılan)"</item>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 32a56f4..5eaf6d9 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -100,9 +100,9 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"توثیق نہ کریں"</item>
- <item msgid="5703177653586269306">"سرٹیفکیٹ کی صورتحال درخواست کریں"</item>
- <item msgid="326388247868439528">"سرٹیفکیٹ کی صورتحال درکار ہے"</item>
- <item msgid="1090956283885790552">"تمام غیر بھروسہ مند سرٹیفکیٹ کی صورتحال درکار ہے"</item>
+ <item msgid="5703177653586269306">"سرٹیفکیٹ کی صورتحال کی درخواست کریں"</item>
+ <item msgid="326388247868439528">"سرٹیفکیٹ کی صورتحال کا مطالبہ کریں"</item>
+ <item msgid="1090956283885790552">"تمام غیر بھروسہ مند سرٹیفکیٹ کی صورت احوال کا مطالبہ کریں"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"پش بٹن"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index dc822b9..2d72133 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -88,7 +88,7 @@
<item msgid="3409219643606946053">"正在连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
<item msgid="7891463004457278422">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 进行身份验证..."</item>
<item msgid="3193388999810487137">"正在从<xliff:g id="NETWORK_NAME">%1$s</xliff:g>获取IP地址..."</item>
- <item msgid="2227930004124157952">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+ <item msgid="2227930004124157952">"已连接到“<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</item>
<item msgid="7104168043537022445">"已暂停"</item>
<item msgid="2595938203187002544">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
<item msgid="2435175968703898648">"已断开连接"</item>
@@ -176,7 +176,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4669222334822978847">"无"</item>
<item msgid="6242198071587397280">"手动"</item>
- <item msgid="464383874780058242">"代理自动配置"</item>
+ <item msgid="464383874780058242">"代理自动配置 (PAC)"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="2900892411844440682">"无"</item>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 19290b1..1a2d3f5 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -483,8 +483,8 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"自動偵測"</item>
- <item msgid="3779092145391320375">"設定為按用量收費"</item>
- <item msgid="2047166446768045816">"設定為非按用量收費"</item>
+ <item msgid="3779092145391320375">"視為按用量收費"</item>
+ <item msgid="2047166446768045816">"視為非按用量收費"</item>
</string-array>
<string-array name="wifi_privacy_entries">
<item msgid="3485945604919292489">"使用隨機 MAC (預設)"</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6e88b76..9f92426 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -791,6 +791,15 @@
<item>Very large</item>
</string-array>
+ <!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
+ <string-array name="captioning_font_size_selector_summaries">
+ <item>Very small text size</item>
+ <item>Small text size</item>
+ <item>Default text size</item>
+ <item>Large text size</item>
+ <item>Very large text size</item>
+ </string-array>
+
<!-- Values for captioning font size preference. -->
<string-array name="captioning_font_size_selector_values" translatable="false" >
<item>0.25</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9bc9b5e..66aa0b1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4986,10 +4986,14 @@
<string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback">Swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold.</string>
<!-- Title for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_title_hardware">Hold volume keys</string>
+ <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_shortcut_hardware_keyword">hold volume keys</string>
<!-- Summary for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_summary_hardware">Press & hold both volume keys</string>
<!-- Title for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_title_triple_tap">Triple-tap screen</string>
+ <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_shortcut_triple_tap_keyword">triple-tap screen</string>
<!-- Summary for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_summary_triple_tap">Quickly tap screen 3 times. This shortcut may slow down your device.</string>
<!-- Title for the accessibility edit shortcut dialog to save the preference when user clicks it. [CHAR LIMIT=20] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ae49c6e..8393f80 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -498,20 +498,20 @@
<style name="Widget.SliceView.Settings">
<item name="titleSize">@*android:dimen/text_size_subhead_material</item>
- <item name="rowStyle">@style/SliceRowStyle.Settings</item>
+ <item name="rowStyle">@style/SliceRow.Settings</item>
</style>
- <style name="SliceViewStyle">
- <item name="rowStyle">@style/SliceRowStyle</item>
+ <style name="Widget.SliceView.Panel">
+ <item name="titleSize">16sp</item>
+ <item name="rowStyle">@style/SliceRow</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
- <style name="SliceViewSliderStyle">
- <item name="rowStyle">@style/SliceRowSliderStyle</item>
- <item name="android:background">?android:attr/colorBackgroundFloating</item>
+ <style name="Widget.SliceView.Panel.Slider">
+ <item name="rowStyle">@style/SliceRow.Slider</item>
</style>
- <style name="SliceRowSliderStyle">
+ <style name="SliceRow.Slider">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<item name="titleItemEndPadding">0dp</item>
@@ -535,11 +535,12 @@
<item name="subContentStartPadding">6dp</item>
</style>
- <style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">
+ <style name="Widget.SliceView.ContextualCard">
+ <item name="rowStyle">@style/SliceRow</item>
<item name="android:background">@color/contextual_card_background</item>
</style>
- <style name="SliceRowStyle">
+ <style name="SliceRow">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">2dp</item>
<item name="titleItemEndPadding">0dp</item>
@@ -560,7 +561,7 @@
<item name="actionDividerHeight">32dp</item>
</style>
- <style name="SliceRowStyle.Settings">
+ <style name="SliceRow.Settings">
<!-- Padding between content and the start icon is 8dp -->
<item name="contentStartPadding">8dp</item>
</style>
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index a86b441..a147656 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -63,6 +63,7 @@
LifecycleObserver, OnStart, OnStop, OnDestroy, CachedBluetoothDevice.Callback {
private static final String TAG = "AdvancedBtHeaderCtrl";
private static final int LOW_BATTERY_LEVEL = 15;
+ private static final int CASE_LOW_BATTERY_LEVEL = 19;
private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
@VisibleForTesting
@@ -226,7 +227,7 @@
final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
textView.setText(com.android.settings.Utils.formatPercentage(batteryLevel));
textView.setVisibility(View.VISIBLE);
- showBatteryIcon(linearLayout, batteryLevel, charging);
+ showBatteryIcon(linearLayout, batteryLevel, charging, batteryMetaKey);
} else {
// Hide it if it doesn't have battery information
linearLayout.setVisibility(View.GONE);
@@ -237,8 +238,12 @@
textView.setVisibility(View.VISIBLE);
}
- private void showBatteryIcon(LinearLayout linearLayout, int level, boolean charging) {
- boolean enableLowBattery = level <= LOW_BATTERY_LEVEL && !charging;
+ private void showBatteryIcon(LinearLayout linearLayout, int level, boolean charging,
+ int batteryMetaKey) {
+ final int lowBatteryLevel =
+ batteryMetaKey == BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY
+ ? CASE_LOW_BATTERY_LEVEL : LOW_BATTERY_LEVEL;
+ final boolean enableLowBattery = level <= lowBatteryLevel && !charging;
final ImageView imageView = linearLayout.findViewById(R.id.bt_battery_icon);
if (enableLowBattery) {
imageView.setImageDrawable(mContext.getDrawable(R.drawable.ic_battery_alert_24dp));
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index a5056a9..aaee2b3 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -32,6 +32,7 @@
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.os.Bundle;
+import android.provider.Settings;
import android.text.TextUtils;
import androidx.preference.ListPreference;
@@ -41,15 +42,19 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import java.util.Arrays;
import java.util.List;
public class InactiveApps extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener {
- private static final CharSequence[] SETTABLE_BUCKETS_NAMES =
+ private static final CharSequence[] FULL_SETTABLE_BUCKETS_NAMES =
{"ACTIVE", "WORKING_SET", "FREQUENT", "RARE", "RESTRICTED"};
- private static final CharSequence[] SETTABLE_BUCKETS_VALUES = {
+ private static final CharSequence[] REDUCED_SETTABLE_BUCKETS_NAMES =
+ Arrays.copyOfRange(FULL_SETTABLE_BUCKETS_NAMES, 0, 4);
+
+ private static final CharSequence[] FULL_SETTABLE_BUCKETS_VALUES = {
Integer.toString(STANDBY_BUCKET_ACTIVE),
Integer.toString(STANDBY_BUCKET_WORKING_SET),
Integer.toString(STANDBY_BUCKET_FREQUENT),
@@ -57,6 +62,9 @@
Integer.toString(STANDBY_BUCKET_RESTRICTED)
};
+ private static final CharSequence[] REDUCED_SETTABLE_BUCKETS_VALUES =
+ Arrays.copyOfRange(FULL_SETTABLE_BUCKETS_VALUES, 0, 4);
+
private UsageStatsManager mUsageStats;
@Override
@@ -86,6 +94,13 @@
final Context context = getActivity();
final PackageManager pm = context.getPackageManager();
final String settingsPackage = context.getPackageName();
+ final boolean allowRestrictedBucket = Settings.Global.getInt(getContentResolver(),
+ Settings.Global.ENABLE_RESTRICTED_BUCKET,
+ Settings.Global.DEFAULT_ENABLE_RESTRICTED_BUCKET) == 1;
+ final CharSequence[] bucketNames = allowRestrictedBucket
+ ? FULL_SETTABLE_BUCKETS_NAMES : REDUCED_SETTABLE_BUCKETS_NAMES;
+ final CharSequence[] bucketValues = allowRestrictedBucket
+ ? FULL_SETTABLE_BUCKETS_VALUES : REDUCED_SETTABLE_BUCKETS_VALUES;
Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -96,8 +111,8 @@
p.setTitle(app.loadLabel(pm));
p.setIcon(app.loadIcon(pm));
p.setKey(packageName);
- p.setEntries(SETTABLE_BUCKETS_NAMES);
- p.setEntryValues(SETTABLE_BUCKETS_VALUES);
+ p.setEntries(bucketNames);
+ p.setEntryValues(bucketValues);
updateSummary(p);
// Don't allow Settings to change its own standby bucket.
if (TextUtils.equals(packageName, settingsPackage)) {
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index 73d7b85..792bba5 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -145,5 +145,12 @@
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.gesture_navigation_settings);
+ new BaseSearchIndexProvider(R.xml.gesture_navigation_settings) {
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return SystemNavigationPreferenceController.isGestureAvailable(context);
+ }
+ };
+
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 5097938..5c4e03d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -59,7 +59,8 @@
private static final int BATTERY_LEVEL_MAIN = 30;
private static final int BATTERY_LEVEL_LEFT = 25;
private static final int BATTERY_LEVEL_RIGHT = 45;
- private static final int LOW_BATTERY_LEVEL = 5;
+ private static final int LOW_BATTERY_LEVEL = 15;
+ private static final int CASE_LOW_BATTERY_LEVEL = 19;
private static final String ICON_URI = "content://test.provider/icon.png";
private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
@@ -156,7 +157,7 @@
String.valueOf(LOW_BATTERY_LEVEL).getBytes());
when(mBluetoothDevice.getMetadata(
BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY)).thenReturn(
- String.valueOf(BATTERY_LEVEL_MAIN).getBytes());
+ String.valueOf(CASE_LOW_BATTERY_LEVEL).getBytes());
when(mBluetoothDevice.getMetadata(
BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING)).thenReturn(
String.valueOf(false).getBytes());
@@ -173,7 +174,8 @@
assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_left),
R.drawable.ic_battery_alert_24dp);
assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_right), /* resId= */-1);
- assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_middle), /* resId= */ -1);
+ assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_middle),
+ R.drawable.ic_battery_alert_24dp);
}
@Test