Merge "Remove useless folder"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 103d671..13eed78 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -79,7 +79,6 @@
<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
<uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
- <uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index b3b699a..dca0972 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -44,16 +44,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:minLines="2"
+ android:minLines="3"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
android:textColor="?android:attr/textColorPrimary"/>
- <TextView
- android:id="@+id/summary2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
- android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>
<com.android.settings.fuelgauge.BatteryMeterView
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index b9a910b..83a0833 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -311,6 +311,25 @@
style="@style/wifi_item_content"
android:text="@string/wifi_show_password" />
</LinearLayout>
+
+ <LinearLayout android:id="@+id/sae_password_id_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item"
+ android:visibility="gone">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_label"
+ android:text="@string/wifi_sae_password_id" />
+
+ <EditText android:id="@+id/sae_password_id"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_edit_content"
+ android:singleLine="true"
+ android:inputType="textNoSuggestions" />
+ </LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/wifi_advanced_toggle"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e8db2a4..f4750ff 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
<string name="wifi_password" msgid="5948219759936151048">"Wagwoord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-wagwoordidentifiseerder"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Wys wagwoord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Kies toegangspuntband"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Outo"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0a15944..4b2a812 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"መታወቂያ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ስም አልባ መታወቂያ"</string>
<string name="wifi_password" msgid="5948219759936151048">" የይለፍ ቃል፡"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE የይለፍ ቃል ለዪ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"የይለፍ ቃል አሳይ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"የመዳረሻ ነጥብ ባንድ ይምረጡ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ራስ-ሰር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9c2f462..63392fb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -999,6 +999,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"الهوية"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"هوية مجهولة"</string>
<string name="wifi_password" msgid="5948219759936151048">"كلمة المرور"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"معرّف كلمة مرور SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"إظهار كلمة المرور"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"تحديد نطاق AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"تلقائي"</string>
@@ -3253,7 +3254,7 @@
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"الجوّال"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"استخدام البيانات"</string>
<string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"نقطة اتصال"</string>
- <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المرتبطة"</string>
+ <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المتّصلة"</string>
<string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"بلوتوث، وضع القيادة، NFC"</string>
<string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"بلوتوث، وضع القيادة"</string>
<string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"بلوتوث وNFC"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index e98be39..24e48fd 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -934,6 +934,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"পৰিচয়"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"পৰিচয় অজ্ঞাত"</string>
<string name="wifi_password" msgid="5948219759936151048">"পাছৱৰ্ড"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"পাছৱৰ্ড দেখুৱাওক"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP বেণ্ড বাছনি কৰক"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"স্বয়ংক্ৰিয়"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index d618077..8df3d6b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"İdentiklik"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parol identifikatoru"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parolu göstər"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP Band Seçin"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index b4425bc..f1166f5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator SAE lozinke"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Izaberite opseg pristupne tačke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 80f7ade..2d9f7d7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ідэнтыфікатар"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ананімны ідэнтыфікатар"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Ідэнтыфікатар пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Паказваць пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Выбраць дыяпазон для пунктаў доступу"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Аўтаматычна"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c18f897..ff59c6d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Самоличност"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимна самоличност"</string>
<string name="wifi_password" msgid="5948219759936151048">"Парола"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор на парола за SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показване на паролата"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Избиране на честота на точката за достъп"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматично"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0dfd215..6c98068 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"পরিচয়"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"নামহীন পরিচয়"</string>
<string name="wifi_password" msgid="5948219759936151048">"পাসওয়ার্ড"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"পাসওয়ার্ড দেখুন"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড বেছে নিন"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"অটোমেটিক"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 8a649e6..f17c338 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -362,9 +362,9 @@
<item msgid="1319652728542138112">"Zadano"</item>
<item msgid="1016452621833735880">"Sans-serif"</item>
<item msgid="2496277987934654454">"Sans-serif kondenzovani"</item>
- <item msgid="7247838127505318669">"Sans-serif fiksnog razmaka"</item>
+ <item msgid="7247838127505318669">"Sans-serif monospace"</item>
<item msgid="4478414822462359763">"Serif"</item>
- <item msgid="7502451783483660829">"Serif fiksnog razmaka"</item>
+ <item msgid="7502451783483660829">"Serif monospace"</item>
<item msgid="639503332147461010">"Casual"</item>
<item msgid="7967169925231332424">"Kurziv"</item>
<item msgid="561832997193039673">"Mala početna slova"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d4bb3b3..f2ca4b3 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator lozinke za SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite opseg pristupne tačke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 6b8103f..a4454cd 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -380,7 +380,7 @@
<item msgid="4733815704128258753">"Predeterminat"</item>
<item msgid="3217099060748617005">"Cap"</item>
<item msgid="7467615139904599420">"Contorn"</item>
- <item msgid="5623165557468608975">"Ombra paral·lela"</item>
+ <item msgid="5623165557468608975">"Ombra"</item>
<item msgid="8088451174058214588">"Elevat"</item>
<item msgid="3821418743395480313">"Enfonsat"</item>
</string-array>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 217ea30..3e62b25 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitat"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitat anònima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contrasenya"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de password SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostra la contrasenya"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecciona la banda del punt d\'accés"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automàtica"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f9cf05e..99270be 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymní identita"</string>
<string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikátor hesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovat heslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vybrat pásmo přístupového bodu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatické"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9e83f1f..fadbf95 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Adgangskode"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Adgangskode-id til SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Vis adgangskode"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vælg AP-bånd"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisk"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index aa824cc..7ed62a0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
<string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-Passwort-Kennzeichnung"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Band für Zugangspunkt auswählen"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisch"</string>
@@ -1184,7 +1185,7 @@
<string name="accessibility_personal_account_title" msgid="2169071663029067826">"Privates Konto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="search_settings" msgid="1910951467596035063">"Suche"</string>
<string name="display_settings" msgid="7965901687241669598">"Display"</string>
- <string name="accelerometer_title" msgid="7854608399547349157">"Display automatisch drehen"</string>
+ <string name="accelerometer_title" msgid="7854608399547349157">"Bildschirm automatisch drehen"</string>
<string name="color_mode_title" msgid="9186249332902370471">"Farben"</string>
<string name="color_mode_option_natural" msgid="5013837483986772758">"Natürlich"</string>
<string name="color_mode_option_boosted" msgid="8588223970257287524">"Verstärkt"</string>
@@ -2121,7 +2122,7 @@
<string name="accessibility_setting_item_control_timeout_title" msgid="870367947690762063">"Zeit zum Reagieren"</string>
<string name="accessibility_control_timeout_preference_title" msgid="3076566452307147390">"Zeit zum Reagieren"</string>
<string name="accessibility_control_timeout_preference_summary" msgid="6557680564604287459">"Hier kannst du auswählen, wie lange Nachrichten sichtbar sind, die eine Reaktion erfordern, aber nur vorübergehend angezeigt werden.\n\nDiese Einstellung wird nicht von allen Apps unterstützt."</string>
- <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Reaktionszeit Berühren/Halten"</string>
+ <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"\"Berühren und halten\"-Reaktionszeit"</string>
<string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Farbumkehr"</string>
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kann sich auf die Leistung auswirken"</string>
<string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"Verweildauer"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 289a93b..9791cbf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ανώνυμη ταυτότητα"</string>
<string name="wifi_password" msgid="5948219759936151048">"Κωδικός πρόσβασης"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Αναγνωριστικό κωδ. πρόσβασης SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Εμφάνιση κωδικού πρόσβασης"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Επιλέξτε ζώνη σημείου πρόσβασης"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Αυτόματα"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 45c4612..c54a59c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 44c9b4c..89ae25f 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 45c4612..c54a59c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 9af4af0..6dabd10 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c2a87c8..197d0c7 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -934,6 +934,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1b8ba10..95743bc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de contraseña SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
@@ -3720,7 +3721,7 @@
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categoría: Poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categoría: Desactivadas"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categoría: Con interrupciones"</string>
- <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
+ <string name="advanced_apps" msgid="4812975097124803873">"Avanzado"</string>
<string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
<string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
<string name="app_permissions" msgid="5584182129908141622">"Administrador de permisos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 02476b3..f152d5a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -184,7 +184,7 @@
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados anteriormente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth activado"</string>
- <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todo"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todos"</string>
<string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Elige una zona horaria"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ID de contraseña SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda de AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automática"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fffc920..0a455c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonüümne identiteet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parool"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parooli identifikaator"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Kuva parool"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP-riba valimine"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaatne"</string>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index ff5120f..b14ea41 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -350,7 +350,7 @@
<item msgid="2404067308793740341">"Idatzi memorian"</item>
<item msgid="5832543806893763620">"Aktibatu pantaila"</item>
<item msgid="5258373962467495905">"Lortu kontuak"</item>
- <item msgid="334625385979270703">"Abiarazi atzeko planoan"</item>
+ <item msgid="334625385979270703">"Exekutatu atzeko planoan"</item>
<item msgid="9039213578110332702">"Erabilerraztasun-eginbideen bolumena"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
@@ -443,7 +443,7 @@
<item msgid="3396458970745718652">"Garrantzitsua (atzeko planokoa)"</item>
<item msgid="5214825238247511992">"Babeskopiak"</item>
<item msgid="311372689168254967">"Handia"</item>
- <item msgid="7438189122367820362">"Zerbitzua (abian)"</item>
+ <item msgid="7438189122367820362">"Zerbitzua (exekutatzen)"</item>
<item msgid="918687422516982498">"Zerbitzua (berrabiarazten)"</item>
<item msgid="6807727069641853029">"Hargailua"</item>
<item msgid="6782857406100845127">"Hasiera"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c983f66..0c847eb 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitatea"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimoa"</string>
<string name="wifi_password" msgid="5948219759936151048">"Pasahitza"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"Erakutsi pasahitza"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Hautatu AP banda"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatikoa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3d0602a..f159c30 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"هویت"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"هویت ناشناس"</string>
<string name="wifi_password" msgid="5948219759936151048">"گذرواژه"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"شناسه گذرواژه SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"نمایش گذرواژه"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"انتخاب باند AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"خودکار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ce62542..1d3b4d4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteetti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyymi identiteetti"</string>
<string name="wifi_password" msgid="5948219759936151048">"Salasana"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-salasanatunniste"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Näytä salasana"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Valitse AP-taajuus"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaattinen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4e86b70..ac300cd 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifiant de mot de passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index cad7583..52b9675 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -485,7 +485,7 @@
<item msgid="3863157480502955888">"Oui"</item>
</string-array>
<string-array name="dark_ui_mode_entries">
- <item msgid="4047603501491142527">"Sombre"</item>
+ <item msgid="4047603501491142527">"Foncé"</item>
<item msgid="2291969684082074001">"Clair"</item>
</string-array>
<string-array name="autofill_logging_level_entries">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e7ee1af..6141292 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifiant du mot de passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatique"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 411ccec..0a6a42d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contrasinal"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador do contrasinal SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contrasinal"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automática"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e5cd257..f5f2f9c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ઓળખાણ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"અનામ ઓળખાણ"</string>
<string name="wifi_password" msgid="5948219759936151048">"પાસવર્ડ"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE પાસવર્ડ ઓળખકર્તા"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"પાસવર્ડ બતાવો"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP બેન્ડ પસંદ કરો"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"આપમેળે"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 98deee9..80f3100 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -239,7 +239,7 @@
<item msgid="4600463921908905030">"मैसेज (एसएमएस) पाएं"</item>
<item msgid="5958926493289432745">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>
<item msgid="4945269495221089540">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
- <item msgid="5570472453573929087">"WAP पुश पाएं"</item>
+ <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
<item msgid="7125408150230860501">"मैसेज (एसएमएस) भेजें"</item>
<item msgid="7080337936612188061">"ICC मैसेज (एसएमएस) पढ़ें"</item>
<item msgid="587124103118495063">"ICC मैसेज (एसएमएस) लिखें"</item>
@@ -263,7 +263,7 @@
<item msgid="2029227495214047094">"सचेत रखें"</item>
<item msgid="26109888160231211">"जगह की निगरानी करें"</item>
<item msgid="5753382310468855812">"उच्च पावर वाली जगह की निगरानी करें"</item>
- <item msgid="3356591542543137332">"उपयोग के आंकड़े पाएं"</item>
+ <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
<item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
<item msgid="2111767435887685265">"टोस्ट दिखाएं"</item>
<item msgid="1091168669714823370">"प्रोजेक्ट मीडिया"</item>
@@ -282,7 +282,7 @@
<item msgid="3591971310048485247">"मेमोरी पढ़ें"</item>
<item msgid="4041187808621866119">"मेमोरी लिखें"</item>
<item msgid="6628873315024166197">"स्क्रीन चालू करें"</item>
- <item msgid="3253368931113490863">"खाते पाएं"</item>
+ <item msgid="3253368931113490863">"खाते प्राप्त करें"</item>
<item msgid="780392378084812901">"पृष्ठभूमि में चलाएं"</item>
<item msgid="2629748510881309577">"सुलभता सुविधाओं के लिए आवाज़"</item>
</string-array>
@@ -330,7 +330,7 @@
<item msgid="4665183401128289653">"सचेत रखें"</item>
<item msgid="8584357129746649222">"जगह"</item>
<item msgid="7669257279311110599">"जगह"</item>
- <item msgid="3459320345690097795">"उपयोग के आंकड़े पाएं"</item>
+ <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
<item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
<item msgid="427580389823724225">"टोस्ट दिखाएं"</item>
<item msgid="4992007785575926253">"प्रोजेक्ट मीडिया"</item>
@@ -349,7 +349,7 @@
<item msgid="1246296877820358565">"मेमोरी पढ़ें"</item>
<item msgid="2404067308793740341">"मेमोरी लिखें"</item>
<item msgid="5832543806893763620">"स्क्रीन चालू करें"</item>
- <item msgid="5258373962467495905">"खाते पाएं"</item>
+ <item msgid="5258373962467495905">"खाते प्राप्त करें"</item>
<item msgid="334625385979270703">"पृष्ठभूमि में चलाएं"</item>
<item msgid="9039213578110332702">"सुलभता सुविधाओं के लिए आवाज़"</item>
</string-array>
@@ -359,7 +359,7 @@
<item msgid="2372711992605524591">"ज़्यादा"</item>
</string-array>
<string-array name="captioning_typeface_selector_titles">
- <item msgid="1319652728542138112">"डिफ़ॉल्ट"</item>
+ <item msgid="1319652728542138112">"सामान्य"</item>
<item msgid="1016452621833735880">"Sans-serif"</item>
<item msgid="2496277987934654454">"Sans-serif condensed"</item>
<item msgid="7247838127505318669">"Sans-serif monospace"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6c71a53..7563ff5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"पहचान"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अनाम पहचान"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE पासवर्ड पहचानकर्ता"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड दिखाएं"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP बैंड चुनें"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"अपने आप"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3a13414..e082427 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniman identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Zaporka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator zaporke za SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaži zaporku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite frekvenciju pristupne točke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2ba9c0e..f6e0b2a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Azonosság"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Név nélküli identitás"</string>
<string name="wifi_password" msgid="5948219759936151048">"Jelszó"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE jelszóazonosító"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Jelszó megjelenítése"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP sáv kiválasztása"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatikus"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 1b35ec4..3037194 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -88,7 +88,7 @@
<item msgid="8937994881315223448">"Միացված է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին"</item>
<item msgid="1330262655415760617">"Անջատված"</item>
<item msgid="7698638434317271902">"Անջատվում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
- <item msgid="197508606402264311">"Անջատված է"</item>
+ <item msgid="197508606402264311">"Անջատած է"</item>
<item msgid="8578370891960825148">"Անհաջող"</item>
<item msgid="5660739516542454527">"Արգելափակված"</item>
<item msgid="1805837518286731242">"Վատ ցանցից ժամանակավոր խուսափում"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index fdae664..a5d3785 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ինքնություն"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Անանուն ինքնություն"</string>
<string name="wifi_password" msgid="5948219759936151048">"Գաղտնաբառ"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE գաղտնաբառի նույնացուցիչ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Ցույց տալ գաղտնաբառը"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi հաճախականությունների դիապազոն"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Ավտոմատ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 07bb87f..4799747 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -544,11 +544,11 @@
<string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Peringatan: Perangkat Anda akan dihapus setelah <xliff:g id="COUNT">^1</xliff:g> percobaan gagal lagi dalam pembukaan kunci!"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
- <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
- <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
+ <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+ <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Dekripsi gagal"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beralih metode masukan"</string>
<string name="suggested_lock_settings_title" msgid="8498743819223200961">"Amankan ponsel Anda"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="2296800316150748710">"Setel kunci layar untuk melindungi tablet"</string>
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitas"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitas anonim"</string>
<string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ID sandi SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pilih AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatis"</string>
@@ -1465,7 +1466,7 @@
<string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ini dikeluarkan dengan aman, tetapi masih ada. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus memasangnya terlebih dahulu."</string>
<string name="storage_dialog_unmountable" msgid="3732209361668282254">"<xliff:g id="NAME_0">^1</xliff:g> ini rusak. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus menyiapkannya terlebih dahulu."</string>
<string name="storage_dialog_unsupported" msgid="4503128224360482228">"Perangkat ini tidak mendukung <xliff:g id="NAME_0">^1</xliff:g> ini. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini dengan perangkat ini, Anda harus menyiapkannya terlebih dahulu."</string>
- <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk melakukan backup terlebih dahulu. \n\n"<b>"Backup foto & media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Backup aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan di-uninstal dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
+ <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk melakukan pencadangan terlebih dahulu. \n\n"<b>"Cadangkan foto & media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Cadangkan aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan di-uninstal dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
<string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Saat Anda mengeluarkan <xliff:g id="NAME_0">^1</xliff:g> ini, aplikasi yang tersimpan di situ tidak akan berfungsi lagi, dan file media yang tersimpan di situ baru dapat tersedia jika dicolokkan kembali."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ini diformat untuk berfungsi hanya di perangkat ini dan tidak akan berfungsi di perangkat lain."</string>
<string name="storage_internal_forget_details" msgid="9028875424669047327">"Untuk menggunakan aplikasi, foto, atau data dalam <xliff:g id="NAME">^1</xliff:g> ini, colokkan kembali. \n\nAtau, Anda dapat memilih untuk melupakan penyimpanan ini jika perangkat tidak tersedia. \n\nJika Anda memilih untuk melupakan, semua data dalam perangkat ini akan hilang selamanya. \n\nNanti Anda dapat memasang ulang aplikasi, tetapi datanya yang disimpan di perangkat ini akan hilang."</string>
<string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Lupakan <xliff:g id="NAME">^1</xliff:g>?"</string>
@@ -2594,7 +2595,7 @@
<string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
<string name="backup_summary_state_on" msgid="6407084627816231202">"Aktif"</string>
<string name="backup_summary_state_off" msgid="7388321532624105594">"Nonaktif"</string>
- <string name="backup_section_title" msgid="7952232291452882740">"Mencadangkan & memulihkan"</string>
+ <string name="backup_section_title" msgid="7952232291452882740">"Pencadangan & pemulihan"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
<string name="backup_data_summary" msgid="708773323451655666">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 90f0e7e..aaa6547 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Auðkenni"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Nafnlaust auðkenni"</string>
<string name="wifi_password" msgid="5948219759936151048">"Aðgangsorð"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-auðkenni aðgangsorðs"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Sýna aðgangsorð"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Velja útvarpstíðni"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Sjálfvirkt"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 71ad407..94548d8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identità anonima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificatore password SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleziona banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatica"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index da40452..1b8b558 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"זהות"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"זהות אנונימית"</string>
<string name="wifi_password" msgid="5948219759936151048">"סיסמה"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"מזהה סיסמה מסוג SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"הצגת סיסמה"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"בחר תדר AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"אוטומטי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c005e37..4b54bb9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名ID"</string>
<string name="wifi_password" msgid="5948219759936151048">"パスワード"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE パスワード ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"パスワードを表示する"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP帯域幅を選択"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 419c8d6..43d7d20 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"იდენტობა"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"უცნობი"</string>
<string name="wifi_password" msgid="5948219759936151048">"პაროლი"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE პაროლის იდენტიფიკატორი"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"პაროლის გამოჩენა"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"აირჩიეთ AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ავტომატური"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c657989..1aaa6bb 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Бірлік"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимді бірлік"</string>
<string name="wifi_password" msgid="5948219759936151048">"Құпия сөз"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE құпия сөз идентификаторы"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Құпия сөзді көрсету"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жиілік ауқымын таңдау"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 2f2d692..c854075 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណអនាមិក"</string>
<string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ព័ត៌មានសម្គាល់ពាក្យសម្ងាត់ SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញពាក្យសម្ងាត់"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ជ្រើសរើសរលកសញ្ញា AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ស្វ័យប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 4372f40..5221b0c 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ಗುರುತಿಸುವಿಕೆ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ಅನಾಮಧೇಯ ಗುರುತಿಸುವಿಕೆ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ಪಾಸ್ವರ್ಡ್"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ಪಾಸ್ವರ್ಡ್ ತೋರಿಸು"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ಸ್ವಯಂ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c943c31..6474e6f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"익명 ID"</string>
<string name="wifi_password" msgid="5948219759936151048">"비밀번호"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 비밀번호 식별자"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"비밀번호 표시"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP 대역 선택"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"자동"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 171a667..dc818d5 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -934,6 +934,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентификация"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Аныктыгы жашыруун"</string>
<string name="wifi_password" msgid="5948219759936151048">"Сырсөз"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Сырсөздөрдүн аныктыгын бир убакта текшерүү (SAE) идентификатору"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Сырсөздү көрсөтүү"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жыштыгынын диапазону"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 073eef5..9ff1917 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ການລະບຸໂຕຕົນ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ໂຕຕົນທີ່ບໍ່ລະບຸຊື່"</string>
<string name="wifi_password" msgid="5948219759936151048">"ລະຫັດຜ່ານ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ສະແດງລະຫັດຜ່ານ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ເລືອກຄື້ນ AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ອັດຕະໂນມັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index eab67ee..6cd08ec 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Tapatybė"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniminė tapatybė"</string>
<string name="wifi_password" msgid="5948219759936151048">"Slaptažodis"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE slaptaž. identifikatorius"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Rodyti slaptažodį"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pasirinkti prieigos taško juostą"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatinė"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bb04c30..a88b24a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identifikācijas dati"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonīmi identifikācijas dati"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parole"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE paroles identifikators"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Rādīt paroli"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Atlasīt piekļuves punkta joslu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automātiski"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6de29f2..632b16f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентитет"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимен идентитет"</string>
<string name="wifi_password" msgid="5948219759936151048">"Лозинка"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор на лозинка за SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Прикажи лозинка"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Изберете појас на АП"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматски"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f0c3adc..db77543 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ഐഡന്റിറ്റി"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"അജ്ഞാത ഐഡന്റിറ്റി"</string>
<string name="wifi_password" msgid="5948219759936151048">"പാസ്വേഡ്"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE പാസ്വേഡ് ഐഡന്റിഫയർ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"പാസ്വേഡ് കാണിക്കുക"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ബാൻഡ് തിരഞ്ഞെടുക്കുക"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"സ്വമേധയാ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index f6a63f6..0451a4a 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Таниулбар"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Нэргүй таниулбар"</string>
<string name="wifi_password" msgid="5948219759936151048">"Нууц үг"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-н нууц үгийн таниулбар"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Нууц үгийг харуулах"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP Band сонгох"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автомат"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0bee1ea..01f43ca 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ओळख"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अनामित ओळख"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड दाखवा"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP बँड निवडा"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"आपोआप"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 1fd9535..601402d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identiti tanpa nama"</string>
<string name="wifi_password" msgid="5948219759936151048">"Kata laluan"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Pengecam kata laluan SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Tunjukkan kata laluan"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pilih Jalur AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatik"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 8d62226..970b8e0 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"တစ်ဦးတစ်ယောက်"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"အမည်မသိသူ"</string>
<string name="wifi_password" msgid="5948219759936151048">"စကားဝှက်"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE စကားဝှက် သတ်မှတ်မှုစနစ်"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"စကားဝှက်ကို ပြသရန်"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP လှိုင်း ရွေးရန်"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"အလိုအလျောက်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 645ab3d..b90ac7a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Passord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator for SAE-passord"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Vis passord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Velg AP-bånd"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisk"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index e6ac03c..bd35c42fc 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -473,7 +473,7 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="5200910605264415911">"स्वतः पत्ता लगाउनुहोस्"</item>
- <item msgid="8745603368609022803">"सशुल्क वाइफाइका रूपमा लिनुहोस्"</item>
+ <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
<item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
</string-array>
<string-array name="wifi_privacy_entries">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2e026c3..557fb74 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"पहिचान गर्नुहोस्"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अज्ञात पहिचान"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड:"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड देखाउनुहोस्"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ब्यान्ड चयन गर्नुहोस्"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"स्वतः निर्धारित"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a0e2607..20717f8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
<string name="wifi_password" msgid="5948219759936151048">"Wachtwoord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-wachtwoord-ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Wachtwoord weergeven"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Frequentieband voor toegangspunt selecteren"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisch"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 76388fb..17b200e 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -934,6 +934,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ପରିଚୟ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ଅଜ୍ଞାତ ପରିଚୟ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ପାସ୍ୱର୍ଡ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ପାସ୍ୱର୍ଡ ଦେଖାନ୍ତୁ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ବ୍ୟାଣ୍ଡ ବାଛନ୍ତୁ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ସ୍ୱତଃ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4a9aee4..d585925 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ਪਛਾਣ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ਅਨਾਮ ਪਛਾਣ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ਪਾਸਵਰਡ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ਪਾਸਵਰਡ ਦਿਖਾਓ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ਬੈਂਡ ਦੀ ਚੋਣ ਕਰੋ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ਸਵੈਚਲਿਤ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5b96d86..e2e6adf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Tożsamość anonimowa"</string>
<string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identyfikator hasła SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wybierz pasmo punktu dostępu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatycznie"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8375892..fc01809 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de senha SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do ponto de acesso"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e512480..f17de01 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Palavra-passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador palavra-passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar palavra-passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do PA"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8375892..fc01809 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de senha SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do ponto de acesso"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 83e08fd..cda0d8a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitate"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimă"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parolă"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificatorul de parole SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afișați parola"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selectați banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6dfd451..5b3a1a4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Неизвестный"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показать пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Диапазон частот Wi-Fi"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 66c9665..5276af3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"අනන්යතාවය"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"නොදන්නා අනන්යතාව"</string>
<string name="wifi_password" msgid="5948219759936151048">"මුරපදය"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE මුරපද අනන්යකාරකය"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"මුරපදය පෙන්වන්න"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP කලාපය තෝරන්න"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ස්වයං"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 87e1b94..a1bc41f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymná identita"</string>
<string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikátor hesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovať heslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vybrať pásmo pre prístupový bod"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaticky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index eef6163..d5ac9bf 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteta"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimna identiteta"</string>
<string name="wifi_password" msgid="5948219759936151048">"Geslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator gesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaži geslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Izbira pasu dostopne točke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Samodejno"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a3d4de4..6982d33 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitet anonim"</string>
<string name="wifi_password" msgid="5948219759936151048">"Fjalëkalimi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikues fjalëkalimi të SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Shfaq fjalëkalimin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Zgjidh bandën AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatik"</string>
@@ -2090,7 +2091,7 @@
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Përdor butonin e qasshmërisë për të hapur"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Përdor gjestin për të hapur"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Përdor gjestin e ri të qasshmërisë"</string>
- <string name="accessibility_tutorial_dialog_message_button" msgid="4803108127318033537">"Për të aktivizuar ose çaktivizuar këtë shërbim, trokit mbi butonin e qasshmërisë<xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g>në fund të ekranit.\n\nPër të kaluar mes shërbimeve, prek dhe mbaj prekur butonin e qasshmërisë."</string>
+ <string name="accessibility_tutorial_dialog_message_button" msgid="4803108127318033537">"Për të aktivizuar ose çaktivizuar këtë shërbim, trokit mbi butonin e qasshmërisë<xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g>në fund të ekranit.\n\nPër të kaluar mes shërbimeve, prek dhe mbaj të shtypur butonin e qasshmërisë."</string>
<string name="accessibility_tutorial_dialog_message_gesture_without_talkback" msgid="5331865763478710038">"Për të aktivizuar ose çaktivizuar këtë shërbim, rrëshqit shpejt lart nga fundi i ekranit me dy gishta.\n\nPër të kaluar mes pajisjeve, rrëshqit shpejt lart me dy gishta dhe mbaje prekur."</string>
<string name="accessibility_tutorial_dialog_message_gesture_with_talkback" msgid="7656710338811226339">"Për të aktivizuar ose çaktivizuar këtë shërbim, rrëshqit lart nga fundi i ekranit me tre gishta.\n\nPër të kaluar mes pajisjeve, rrëshqit shpejt lart me tre gishta dhe mbaje prekur."</string>
<string name="accessibility_tutorial_dialog_message_gesture_settings_without_talkback" msgid="3582632565941330367">"Për të aktivizuar ose çaktivizuar një shërbim qasshmërie, rrëshqit shpejt lart nga fundi i ekranit me dy gishta.\n\nPër të kaluar mes pajisjeve, rrëshqit shpejt lart me dy gishta dhe mbaje prekur."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5fb7e17..6dfd34b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -951,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентитет"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимни идентитет"</string>
<string name="wifi_password" msgid="5948219759936151048">"Лозинка"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор SAE лозинке"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Прикажи лозинку"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Изаберите опсег приступне тачке"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Аутоматски"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e2953f4..f5dd551 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lösenord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Lösenordsidentifierare för SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Visa lösenord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Välj AP-band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatiskt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ce59756..f8fc791 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Kitambulisho"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulisho kisichojulikana"</string>
<string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Kitambulishi cha nenosiri la SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Chagua Bendi ya AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatiki"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index fd1ce3e..c293c7d 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -372,7 +372,7 @@
<string-array name="captioning_font_size_selector_titles">
<item msgid="4800919809575254054">"மிகச் சிறியது"</item>
<item msgid="6781094565687692782">"சிறியது"</item>
- <item msgid="8222123259497646551">"சராசரி"</item>
+ <item msgid="8222123259497646551">"இயல்பானது"</item>
<item msgid="5813217276778560466">"பெரியது"</item>
<item msgid="9044232017390975191">"மிகப் பெரியது"</item>
</string-array>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 97fb4e9..415b0b2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"அடையாளம்"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"அநாமதேய அடையாளம்"</string>
<string name="wifi_password" msgid="5948219759936151048">"கடவுச்சொல்"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE கடவுச்சொல் அடையாளங்காட்டி"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"கடவுச்சொல்லைக் காட்டு"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP அலைவரிசையைத் தேர்ந்தெடுக்கவும்"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"தானியங்கு"</string>
@@ -1513,7 +1514,7 @@
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"நகர்த்துவதை ரத்துசெய்"</string>
<string name="storage_wizard_slow_body" msgid="8010127667184768025">"இந்த <xliff:g id="NAME_0">^1</xliff:g> வேகம் குறைவானது போல் தெரிகிறது. \n\nநீங்கள் தொடரலாம், இந்த இடத்திற்கு நகர்த்தப்பட்ட பயன்பாடுகள் தடங்கல்களுடன் இயங்கலாம் மற்றும் தரவைப் பரிமாற்றுவதற்கு அதிக நேரம் எடுக்கலாம். \n\nசிறந்த செயல்திறனுக்கு, வேகமான <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்தவும்."</string>
<string name="storage_wizard_init_v2_title" msgid="8858395869710288372">"<xliff:g id="NAME">^1</xliff:g>ஐ எப்படிப் பயன்படுத்துவீர்கள்?"</string>
- <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="4315585580670552654">"கூடுதல் டேப்லெட் சேமிப்பகம் உபயோகி"</string>
+ <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="4315585580670552654">"கூடுதல் டேப்லெட் சேமிப்பகம்"</string>
<string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="570443086512059390">"இந்த டேப்லெட்டில் உள்ள ஆப்ஸ், ஃபைல்கள் & மீடியாவிற்கு மட்டும்"</string>
<string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"டேப்லெட் சேமிப்பகம்"</string>
<string name="storage_wizard_init_v2_internal_title" product="default" msgid="8373070138732653456">"கூடுதல் மொபைல் சேமிப்பகம் உபயோகி"</string>
@@ -4487,7 +4488,7 @@
<string name="default_for_calls_and_sms" msgid="3862322027700754792">"அழைப்புகளுக்கும் மெசேஜூக்கும்"</string>
<string name="default_for_mobile_data" msgid="955987144209828344">"மொபைல் டேட்டாவுக்கு இயல்பான தேர்வு"</string>
<string name="mobile_data_active" msgid="5108294051762397700">"மொபைல் டேட்டா ஆனில் உள்ளது"</string>
- <string name="mobile_data_off" msgid="5831854766113105657">"மொபைல் டேட்டா ஆஃபில் உள்ளது"</string>
+ <string name="mobile_data_off" msgid="5831854766113105657">"மொபைல் டேட்டா ஆஃப் செய்யப்பட்டுள்ளது"</string>
<string name="subscription_available" msgid="6502502298446954785">"பயன்படுத்துவதற்குத் தயாராக உள்ளது"</string>
<string name="mobile_network_in_range" msgid="8212440637838603215">"தொடர்பு எல்லையில் உள்ளது"</string>
<string name="mobile_network_not_in_range" msgid="5287596455212313284">"தொடர்பு எல்லையில் இல்லை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3898c55..a3b1aa9 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"గుర్తింపు"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"అనామక గుర్తింపు"</string>
<string name="wifi_password" msgid="5948219759936151048">"పాస్వర్డ్"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"పాస్వర్డ్ను చూపు"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP బ్యాండ్ ఎంచుకోండి"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"స్వీయ"</string>
@@ -1827,7 +1829,7 @@
<string name="advanced_settings_summary" msgid="4016682978071086747">"మరిన్ని సెట్టింగ్ల ఎంపికలను ప్రారంభించు"</string>
<string name="application_info_label" msgid="5736524913065714880">"యాప్ సమాచారం"</string>
<string name="storage_label" msgid="8700867073480107253">"నిల్వ"</string>
- <string name="auto_launch_label" msgid="2669236885531442195">"డిఫాల్ట్గా తెరువు"</string>
+ <string name="auto_launch_label" msgid="2669236885531442195">"డిఫాల్ట్గా తెరవడం"</string>
<string name="auto_launch_label_generic" msgid="3230569852551968694">"డిఫాల్ట్లు"</string>
<string name="screen_compatibility_label" msgid="663250687205465394">"స్క్రీన్ అనుకూలత"</string>
<string name="permissions_label" msgid="2605296874922726203">"అనుమతులు"</string>
@@ -3672,7 +3674,7 @@
<string name="slot_number" msgid="3762676044904653577">"(స్లాట్<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
<string name="launch_by_default" msgid="1840761193189009248">"డిఫాల్ట్గా తెరువు"</string>
<string name="app_launch_domain_links_title" msgid="1160925981363706090">"లింక్లను తెరవడం"</string>
- <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"మద్దతిచ్చే లింక్లను తెరవండి"</string>
+ <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"మద్దతిచ్చే లింక్లను తెరవడం"</string>
<string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"అడగకుండానే తెరవాలి"</string>
<string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"మద్దతిచ్చే లింక్లు"</string>
<string name="app_launch_other_defaults_title" msgid="2516812499807835178">"ఇతర డిఫాల్ట్లు"</string>
@@ -3725,7 +3727,7 @@
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"వర్గాలు: ఆఫ్ చేయబడినవి"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"వర్గాలు: అంతరాయం కలిగించవద్దు నియమం పాటించనివి"</string>
<string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
- <string name="configure_apps" msgid="6685680790825882528">"అనువర్తనాలను కాన్ఫిగర్ చేయండి"</string>
+ <string name="configure_apps" msgid="6685680790825882528">"యాప్లను కాన్ఫిగర్ చేయండి"</string>
<string name="unknown_app" msgid="5275921288718717656">"తెలియని యాప్"</string>
<string name="app_permissions" msgid="5584182129908141622">"అనుమతి మేనేజర్"</string>
<string name="app_permissions_summary" msgid="5163974162150406324">"యాప్లు <xliff:g id="APPS">%1$s</xliff:g>ను ఉపయోగిస్తున్నాయి"</string>
@@ -3740,9 +3742,9 @@
<item quantity="other">మద్దతు ఉన్న లింక్లను తెరవగల సామర్థ్యం <xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలకు ఉంది</item>
<item quantity="one">మద్దతు ఉన్న లింక్లను తెరవగల సామర్థ్యం ఒక అనువర్తనానికి ఉంది</item>
</plurals>
- <string name="app_link_open_always" msgid="2474058700623948148">"ఈ అనువర్తనంలో తెరుస్తుంది"</string>
- <string name="app_link_open_ask" msgid="7800878430190575991">"ప్రతిసారి అడుగుతుంది"</string>
- <string name="app_link_open_never" msgid="3407647600352398543">"ఈ అనువర్తనంలో తెరవదు"</string>
+ <string name="app_link_open_always" msgid="2474058700623948148">"ఈ యాప్లో తెరవాలి"</string>
+ <string name="app_link_open_ask" msgid="7800878430190575991">"ప్రతిసారి అడగాలి"</string>
+ <string name="app_link_open_never" msgid="3407647600352398543">"ఈ యాప్లో తెరవకూడదు"</string>
<string name="default_apps_title" msgid="1660450272764331490">"డిఫాల్ట్"</string>
<string name="default_for_work" msgid="9152194239366247932">"కార్యాలయం కోసం డిఫాల్ట్"</string>
<string name="assist_and_voice_input_title" msgid="1733165754793221197">"సహాయకం & వాయిస్ ఇన్పుట్"</string>
@@ -3887,7 +3889,7 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ఇతర యాప్ల ఎగువన కనిపించడానికి అనుమతించు"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"మీరు ఉపయోగించే ఇతర అనువర్తనాలలో ఎగువ భాగంలో కనిపించడం కోసం ఈ అనువర్తనాన్ని అనుమతించండి. మీరు ఆ అనువర్తనాలను ఉపయోగించే సమయంలో ఇది అంతరాయం కలిగించవచ్చు లేదా అవి కనిపించే లేదా ప్రవర్తించే తీరును మార్చవచ్చు."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr వర్చువల్ రియాలిటీ పరిశీలన స్టీరియో సహాయకం సేవ"</string>
- <string name="overlay_settings" msgid="6930854109449524280">"ఇతర యాప్ల ఎగువన ప్రదర్శన"</string>
+ <string name="overlay_settings" msgid="6930854109449524280">"ఇతర యాప్ల పైన ప్రదర్శన"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> యాప్లు ఇతర యాప్ల ఎగువన కనిపించడానికి అనుమతించబడ్డాయి"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"అనుమతి ఉన్న అనువర్తనాలు"</string>
<string name="app_permission_summary_allowed" msgid="1505409933012886711">"అనుమతించబడింది"</string>
@@ -4071,7 +4073,7 @@
<string name="data_saver_off" msgid="6892309031162738794">"ఆఫ్లో ఉంది"</string>
<string name="data_saver_switch_title" msgid="836312690356005669">"డేటా సేవర్ని ఉపయోగించు"</string>
<string name="unrestricted_app_title" msgid="4465437191723332066">"అనియంత్రిత డేటా వినియోగం"</string>
- <string name="unrestricted_app_summary" msgid="6458008993501723912">"డేటా సేవర్ ఆన్లో ఉన్నప్పుడు అనియంత్రిత డేటా యాక్సెస్ను అనుమతించండి"</string>
+ <string name="unrestricted_app_summary" msgid="6458008993501723912">"డేటా సేవర్లో అనియంత్రిత డేటా"</string>
<string name="home_app" msgid="4066188520886810030">"హోమ్ యాప్"</string>
<string name="no_default_home" msgid="7184117487704520238">"డిఫాల్ట్ హోమ్ లేదు"</string>
<string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"సురక్షిత ప్రారంభం"</string>
@@ -4240,7 +4242,7 @@
<string name="oem_lock_info_message" msgid="9218313722236417510">"దయచేసి పరికర రక్షణ ఫీచర్ని ప్రారంభించడానికి పరికరాన్ని మళ్లీ ప్రారంభించండి."</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"మొత్తం <xliff:g id="SIZE">%1$s</xliff:g> అందుబాటులో ఉంచబడింది\n\nచివరిగా <xliff:g id="DATE">%2$s</xliff:g>న అమలు చేయబడింది"</string>
<string name="web_action_enable_title" msgid="4051513950976670853">"తక్షణ యాప్లు"</string>
- <string name="web_action_enable_summary" msgid="3108127559723396382">"లింక్లను యాప్లలో తెరవండి, వాటిని ఇన్స్టాల్ చేయకపోయినా ఫర్వాలేదు"</string>
+ <string name="web_action_enable_summary" msgid="3108127559723396382">"ఏవైనా యాప్లను ఇన్స్టాల్ చేయకపోయినా, వాటిలోనే లింక్లను తెరుస్తుంది"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"తక్షణ యాప్లు"</string>
<string name="instant_apps_settings" msgid="8827777916518348213">"తక్షణ యాప్ల ప్రాధాన్యతలు"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"ఇన్స్టాల్ చేయబడిన యాప్లు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6d5aaeb..6a124e2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ข้อมูลระบุตัวตน"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ตัวตนที่ไม่ระบุชื่อ"</string>
<string name="wifi_password" msgid="5948219759936151048">"รหัสผ่าน"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ตัวระบุรหัสผ่าน SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"แสดงรหัสผ่าน"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"เลือกย่านความถี่ AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"อัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4e46a07..7487422 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Pagkakilanlan"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous na pagkakakilanlan"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifier ng password ng SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Ipakita ang password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pumili ng AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Awtomatiko"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1d59d7b..9f46fa6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
<string name="wifi_password" msgid="5948219759936151048">"Şifre"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE şifre tanımlayıcı"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Şifreyi göster"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Erişim Noktası Bandı Seçin"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatik"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3aa2bcf..0726a3c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -967,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ідентифік."</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонімна ідентиф-ція"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Ідентифікатор пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показати пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Виберіть діапазон частот точки доступу"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматично"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a015321..846353d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -935,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"شناخت"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"گمنام شناخت"</string>
<string name="wifi_password" msgid="5948219759936151048">"پاس ورڈ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"پاس ورڈ دکھائیں"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP بینڈ منتخب کریں"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"خودکار"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5c2866c..b67499b 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Nom"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim nom"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parol identifikatori"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parol berkitilmasin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi chastotalari diapazoni"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 20dbec9..cce4f10 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Nhận dạng"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Danh tính ẩn danh"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mật khẩu"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Mã nhận dạng mật khẩu SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Hiển thị mật khẩu"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Chọn băng tần AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Tự động"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3b036ff..a46a33f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身份"</string>
<string name="wifi_password" msgid="5948219759936151048">"密码"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密码标识符"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"显示密码"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"选择 AP 频段"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自动"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 378a769..f4a9c34 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身分"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
<string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密碼識別碼"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇存取點頻段"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0bcb6eb..49b0eb1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身分"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
<string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密碼 ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"選取存取點頻帶"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cb76654..0ee28b8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -935,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ukuhlonza"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ukuhlonza okungaziwe"</string>
<string name="wifi_password" msgid="5948219759936151048">"Iphasiwedi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Isihlonzi sephasiwedi ye-SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Bonisa iphasiwedi"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Khetha ibhendi le-AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Okuzenzakalelayo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c88eec9..3f11e52 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2143,6 +2143,8 @@
<string name="wifi_eap_anonymous">Anonymous identity</string>
<!-- Label for the password of the secured network -->
<string name="wifi_password">Password</string>
+ <!-- Label for the sae password id of the secured network [CHAR LIMIT=32] -->
+ <string name="wifi_sae_password_id">SAE password identifier</string>
<!-- Label for the check box to show password -->
<string name="wifi_show_password">Show password</string>
<!-- Label for the RadioGroup to choose wifi ap band -->
@@ -2650,7 +2652,7 @@
<!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
<string name="musicfx_title">Music effects</string>
<!-- Sound settings screen, setting option name -->
- <string name="ring_volume_title">Ring volume</string>
+ <string name="ring_volume_title">Ring & notification volume</string>
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_in_silent_title">Vibrate when silent</string>
<!-- Sound settings screen, setting option name -->
@@ -7444,7 +7446,7 @@
<!-- Sounds and Notification -->
<!-- Sound: Dashboard summary indicating the volume of ringtone. example: Ring volume at 20%.
[CHAR LIMIT=100] -->
- <string name="sound_settings_summary">Ring volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
+ <string name="sound_settings_summary">Ring & notification volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
<!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<string name="sound_dashboard_summary">Volume, vibration, Do Not Disturb</string>
@@ -7456,7 +7458,7 @@
<string name="sound_settings_summary_silent">Ringer set to silent</string>
<!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->
- <string name="sound_settings_example_summary">Ring volume at 80%</string>
+ <string name="sound_settings_example_summary">Ring & notification volume at 80%</string>
<!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
<string name="media_volume_option_title">Media volume</string>
@@ -7471,7 +7473,7 @@
<string name="alarm_volume_option_title">Alarm volume</string>
<!-- Sound: Title for the option managing ring volume. [CHAR LIMIT=30] -->
- <string name="ring_volume_option_title">Ring volume</string>
+ <string name="ring_volume_option_title">Ring & notification volume</string>
<!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->
<string name="notification_volume_option_title">Notification volume</string>
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 0663e2a..5df30c2 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -45,7 +45,7 @@
private boolean mRoleVisible;
- private boolean mAppQualified;
+ private boolean mAppVisible;
private PreferenceScreen mPreferenceScreen;
@@ -65,9 +65,9 @@
mRoleVisible = visible;
refreshAvailability();
});
- roleControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName, executor,
- qualified -> {
- mAppQualified = qualified;
+ roleControllerManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
+ visible -> {
+ mAppVisible = visible;
refreshAvailability();
});
}
@@ -94,7 +94,7 @@
if (mContext.getSystemService(UserManager.class).isManagedProfile()) {
return DISABLED_FOR_USER;
}
- return mRoleVisible && mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return mRoleVisible && mAppVisible ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index de28b07..db92659 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -199,7 +199,8 @@
}
@Override
- public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
+ public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
+ long networkTypeMask) {
}
};
diff --git a/src/com/android/settings/development/BubbleGlobalPreferenceController.java b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
index 86d7be1..2f22d09 100644
--- a/src/com/android/settings/development/BubbleGlobalPreferenceController.java
+++ b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
@@ -16,8 +16,6 @@
package com.android.settings.development;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import android.content.Context;
import android.provider.Settings;
@@ -42,7 +40,7 @@
@Override
public String getPreferenceKey() {
- return NOTIFICATION_BUBBLES;
+ return Settings.Global.NOTIFICATION_BUBBLES;
}
@Override
@@ -64,12 +62,12 @@
}
private boolean isEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
- NOTIFICATION_BUBBLES, OFF) == ON;
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON;
}
private void writeSetting(boolean isEnabled) {
- Settings.Secure.putInt(mContext.getContentResolver(),
- NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
}
}
diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 61c5729..d30a42a 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -28,7 +28,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreferenceCompat;
-import com.android.settingslib.display.DisplayDensityUtils;
+import com.android.settingslib.display.DisplayDensityConfiguration;
import java.text.NumberFormat;
@@ -78,7 +78,7 @@
final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;
final int densityDpi = Math.max(newDensity, 120);
- DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+ DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
} catch (Exception e) {
// TODO: display a message instead of silently failing.
Slog.e(TAG, "Couldn't save density", e);
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index ad6c685..13c76ce 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -28,6 +28,7 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.display.DisplayDensityConfiguration;
import com.android.settingslib.display.DisplayDensityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -100,9 +101,9 @@
protected void commit() {
final int densityDpi = mValues[mCurrentIndex];
if (densityDpi == mDefaultDensity) {
- DisplayDensityUtils.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
+ DisplayDensityConfiguration.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
} else {
- DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+ DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
}
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 3064d4f..bfa43d1 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -55,8 +55,6 @@
TextView mBatteryPercentText;
@VisibleForTesting
TextView mSummary1;
- @VisibleForTesting
- TextView mSummary2;
private Activity mActivity;
private PreferenceFragmentCompat mHost;
@@ -90,7 +88,6 @@
.findViewById(R.id.battery_header_icon);
mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- mSummary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
quickUpdateHeaderPreference();
}
@@ -115,9 +112,6 @@
} else {
mSummary1.setText(info.remainingLabel);
}
- // Clear this just to be sure we don't get UI jank on re-entering this view from another
- // activity.
- mSummary2.setText("");
mBatteryMeterView.setBatteryLevel(info.batteryLevel);
mBatteryMeterView.setCharging(!info.discharging);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 04f6b31..4b127ac 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -19,15 +19,12 @@
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
import android.app.settings.SettingsEnums;
-import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
-import android.os.BatteryStats;
import android.os.Bundle;
import android.os.Handler;
import android.provider.SearchIndexableResource;
-import android.provider.Settings;
import android.provider.Settings.Global;
import android.text.format.Formatter;
import android.view.Menu;
@@ -157,7 +154,6 @@
final TextView percentRemaining =
mBatteryLayoutPref.findViewById(R.id.battery_percent);
final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
BatteryInfo oldInfo = batteryInfos.get(0);
BatteryInfo newInfo = batteryInfos.get(1);
percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
@@ -165,14 +161,13 @@
// set the text to the old estimate (copied from battery info). Note that this
// can sometimes say 0 time remaining because battery stats requires the phone
// be unplugged for a period of time before being willing ot make an estimate.
- summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
+ final String OldEstimateString = mPowerFeatureProvider.getOldEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
-
- // for this one we can just set the string directly
- summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+ PowerUtil.convertUsToMs(oldInfo.remainingTimeUs)));
+ final String NewEstimateString = mPowerFeatureProvider.getEnhancedEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+ PowerUtil.convertUsToMs(newInfo.remainingTimeUs)));
+ summary1.setText(OldEstimateString + "\n" + NewEstimateString);
batteryView.setBatteryLevel(oldInfo.batteryLevel);
batteryView.setCharging(!oldInfo.discharging);
diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java
index b68f11d..b57a911 100644
--- a/src/com/android/settings/notification/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/BubblePreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import android.annotation.Nullable;
import android.content.Context;
@@ -113,7 +113,7 @@
}
private boolean isGloballyEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
+ return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
}
@@ -124,7 +124,7 @@
backend.setAllowBubbles(pkg, uid, false);
// changing the global settings will cause the observer on the host page to reload
// correct preference state
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
}
@@ -134,7 +134,7 @@
backend.setAllowBubbles(pkg, uid, true);
// changing the global settings will cause the observer on the host page to reload
// correct preference state
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
}
}
diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
index b1632c4..cc687cf 100644
--- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -100,7 +100,7 @@
}
private boolean isGloballyEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
+ return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
}
}
diff --git a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
index ea16e72..67a4707 100644
--- a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
+++ b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
@@ -16,8 +16,6 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import android.content.Context;
import android.provider.Settings;
diff --git a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
index 398931d..0118a95 100644
--- a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
+++ b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
@@ -47,8 +47,8 @@
public void onStart() {
mContext.getContentResolver().registerContentObserver(
- Settings.Secure.getUriFor(
- Settings.Secure.NOTIFICATION_BUBBLES),
+ Settings.Global.getUriFor(
+ Settings.Global.NOTIFICATION_BUBBLES),
false /* notifyForDescendants */,
this /* observer */);
}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 68ddb3c..e0f0f64 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -133,6 +133,7 @@
@VisibleForTesting
int mAccessPointSecurity;
private TextView mPasswordView;
+ private TextView mSaePasswordIdView;
private ImageButton mSsidScanButton;
private String mUnspecifiedCertString;
@@ -797,6 +798,11 @@
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
}
+ if (mSaePasswordIdView.length() != 0) {
+ config.saePasswordId = mSaePasswordIdView.getText().toString();
+ } else {
+ config.saePasswordId = null;
+ }
break;
case AccessPoint.SECURITY_OWE:
@@ -979,6 +985,23 @@
}
}
+ if (mSaePasswordIdView == null) {
+ mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
+ mSaePasswordIdView.setOnEditorActionListener(this);
+ mSaePasswordIdView.setOnKeyListener(this);
+ }
+
+ if (mAccessPointSecurity == AccessPoint.SECURITY_SAE) {
+ mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
+ if (mAccessPoint != null && mAccessPoint.isSaved()) {
+ if (!TextUtils.isEmpty(mAccessPoint.getConfig().saePasswordId)) {
+ mSaePasswordIdView.setText(mAccessPoint.getConfig().saePasswordId);
+ }
+ }
+ } else {
+ setSaePasswordIdInvisible();
+ }
+
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP &&
mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1260,6 +1283,11 @@
mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
}
+ private void setSaePasswordIdInvisible() {
+ mSaePasswordIdView.setText("");
+ mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
+ }
+
private void setEapMethodInvisible() {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index 81d52d2..7a4c610 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -85,8 +85,8 @@
}
@Test
- public void constructor_callsIsApplicationQualifiedForRole() {
- verify(mRoleControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
+ public void constructor_callsIsApplicationVisibleForRole() {
+ verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), any(Consumer.class));
}
@@ -108,7 +108,7 @@
@Test
public void
getAvailabilityStatus_noCallbackForIsRoleNotVisible_shouldReturnUnsupported() {
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
@@ -117,7 +117,7 @@
@Test
public void getAvailabilityStatus_RoleIsNotVisible_shouldReturnUnsupported() {
setRoleIsVisible(false);
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
@@ -125,7 +125,7 @@
@Test
public void
- getAvailabilityStatus_noCallbackForIsApplicationQualifiedForRole_shouldReturnUnsupported() {
+ getAvailabilityStatus_noCallbackForIsApplicationVisibleForRole_shouldReturnUnsupported() {
setRoleIsVisible(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -133,18 +133,18 @@
}
@Test
- public void getAvailabilityStatus_applicationIsNotQualifiedForRole_shouldReturnUnsupported() {
+ public void getAvailabilityStatus_applicationIsNotVisibleForRole_shouldReturnUnsupported() {
setRoleIsVisible(true);
- setApplicationIsQualifiedForRole(false);
+ setApplicationIsVisibleForRole(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
- public void getAvailabilityStatus_RoleVisibleAndApplicationQualified_shouldReturnAvailable() {
+ public void getAvailabilityStatus_RoleVisibleAndApplicationVisible_shouldReturnAvailable() {
setRoleIsVisible(true);
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
@@ -159,13 +159,13 @@
callback.accept(visible);
}
- private void setApplicationIsQualifiedForRole(boolean qualified) {
+ private void setApplicationIsVisibleForRole(boolean visible) {
final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
Consumer.class);
- verify(mRoleControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
+ verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(qualified);
+ callback.accept(visible);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
index 11ca63f..9e52a88 100644
--- a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
@@ -16,7 +16,7 @@
package com.android.settings.development;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.development.BubbleGlobalPreferenceController.OFF;
import static com.android.settings.development.BubbleGlobalPreferenceController.ON;
@@ -77,7 +77,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 1 /* enabled */);
mController.updateState(mPreference);
@@ -86,7 +86,7 @@
@Test
public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 0 /* enabled */);
mController.updateState(mPreference);
@@ -104,7 +104,7 @@
}
private boolean isSettingEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
OFF /* default off */) == ON;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 5be7274..63e8a80 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -85,7 +85,6 @@
private BatteryMeterView mBatteryMeterView;
private TextView mBatteryPercentText;
private TextView mSummary;
- private TextView mSummary2;
private LayoutPreference mBatteryLayoutPref;
private Intent mBatteryIntent;
private LifecycleOwner mLifecycleOwner;
@@ -102,7 +101,6 @@
mBatteryPercentText = new TextView(mContext);
mSummary = new TextView(mContext);
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- mSummary2 = new TextView(mContext);
mBatteryIntent = new Intent();
mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
@@ -126,7 +124,6 @@
mController.mBatteryMeterView = mBatteryMeterView;
mController.mBatteryPercentText = mBatteryPercentText;
mController.mSummary1 = mSummary;
- mController.mSummary2 = mSummary2;
}
@After
@@ -190,7 +187,6 @@
@Test
public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
mSummary.setText(BATTERY_STATUS);
- mSummary2.setText(BATTERY_STATUS);
mController.quickUpdateHeaderPreference();
@@ -198,7 +194,6 @@
assertThat(mBatteryMeterView.getCharging()).isTrue();
assertThat(mBatteryPercentText.getText().toString()).isEqualTo("60 %");
assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
- assertThat(mSummary2.getText()).isEqualTo(BATTERY_STATUS);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 4d77bdd..7839e1a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -265,20 +265,17 @@
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
- doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
mFragment.onLongClick(new View(mRealContext));
TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
- TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
Robolectric.flushBackgroundThreadScheduler();
- assertThat(summary2.getText().toString()).contains(NEW_ML_EST_SUFFIX);
+ assertThat(summary1.getText().toString()).contains(NEW_ML_EST_SUFFIX);
assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
}
@Test
public void debugMode() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
- doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
mFragment.restartBatteryInfoLoader();
ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
index aafefb51..470cc27 100644
--- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
@@ -20,7 +20,7 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
@@ -103,7 +103,7 @@
@Test
public void testIsAvailable_notIfAppBlocked() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -112,7 +112,7 @@
@Test
public void testIsAvailable_notIfChannelBlocked() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -122,7 +122,7 @@
@Test
public void testIsAvailable_channel_notIfAppOff() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -136,7 +136,7 @@
public void testIsNotAvailable_ifOffGlobally_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -148,7 +148,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -158,7 +158,7 @@
public void testIsAvailable_app_evenIfOffGlobally() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mAppPageController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertTrue(mAppPageController.isAvailable());
@@ -168,7 +168,7 @@
public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -181,7 +181,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -193,7 +193,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -205,7 +205,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertFalse(mController.isAvailable());
}
@@ -225,7 +225,7 @@
@Test
public void testUpdateState_channelNotBlockable() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
@@ -239,7 +239,7 @@
@Test
public void testUpdateState_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canBubble()).thenReturn(true);
@@ -259,7 +259,7 @@
@Test
public void testUpdateState_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!";
appRow.allowBubbles = true;
@@ -281,7 +281,7 @@
@Test
public void testUpdateState_app_offGlobally() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!";
@@ -295,7 +295,7 @@
@Test
public void testOnPreferenceChange_on_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
NotificationChannel channel =
@@ -315,7 +315,7 @@
@Test
public void testOnPreferenceChange_off_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
NotificationChannel channel =
@@ -335,7 +335,7 @@
@Test
public void testOnPreferenceChange_on_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null);
@@ -353,7 +353,7 @@
@Test
public void testOnPreferenceChange_off_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null);
@@ -371,7 +371,7 @@
@Test
public void testOnPreferenceChange_on_app_offGlobally() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
index 04c8e4e..2710203 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
@@ -20,7 +20,7 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
@@ -98,7 +98,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -108,7 +108,7 @@
public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -117,7 +117,7 @@
public void testIsNotAvailable_app_globalOff() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -131,7 +131,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -149,18 +149,18 @@
@Test
public void testGetSummary() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null);
assertEquals("On", mController.getSummary());
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertEquals("Off", mController.getSummary());
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
index 4821322..bd01379 100644
--- a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
@@ -16,8 +16,6 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;