Merge "Fix disabling of tiles that are not relevant" into nyc-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 02615b4..480743b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Stel op"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Ander programme wat by gebruik ingesluit is"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> programme word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
<item quantity="one">1 program word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 638e0f5..a24c964 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -3047,8 +3047,7 @@
<string name="data_limit" msgid="1885406964934590552">"Ograničenje za potrošnju podataka"</string>
<string name="data_usage_template" msgid="392191945602400904">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g> u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Konfigurišite"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije uključene u upotrebu"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija ima dozvolu da koristi neograničenu količinu podataka kada je Ušteda podataka uključena</item>
<item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije imaju dozvolu da koriste neograničenu količinu podataka kada je Ušteda podataka uključena</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f6602c..70b7f7f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3018,8 +3018,7 @@
<string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzt"</string>
<string name="configure" msgid="1029654422228677273">"Konfigurieren"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Weitere bei der Nutzung mitgerechnete Apps"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Apps dürfen uneingeschränkt Daten verbrauchen, auch wenn der Datensparmodus aktiviert ist</item>
<item quantity="one">1 App darf uneingeschränkt Daten verbrauchen, auch wenn der Datensparmodus aktiviert ist</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ed5f38b..e3d06b0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -448,7 +448,7 @@
<string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Huella digital y PIN"</string>
<string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Huella digital y contraseña"</string>
<string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
- <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
+ <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
<string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
<string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
<string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
@@ -2676,8 +2676,8 @@
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
<string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingresar PIN de administrador"</string>
- <string name="switch_on_text" msgid="1124106706920572386">"Activar"</string>
- <string name="switch_off_text" msgid="1139356348100829659">"Desactivar"</string>
+ <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
+ <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
<string name="screen_pinning_title" msgid="2292573232264116542">"Fijar pantalla"</string>
<string name="screen_pinning_description" msgid="3360904523688769289">"Cuando está activada, usa la fijación de pantalla para mantener la vista de la pantalla actual.\n\nPara usar la fijación de pantalla:\n\n1. Asegúrate de que la opción esté activada.\n\n2. Abre la pantalla que deseas fijar.\n\n3. Presiona Descripción general.\n\n4. Desliza el dedo hacia arriba y toca el ícono."</string>
<string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar desbloqueo para quitar fijación"</string>
@@ -3014,8 +3014,7 @@
<string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
<string name="data_usage_template" msgid="392191945602400904">"Datos usados entre <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Configurar"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras apps incluidas en el uso de datos"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps tienen permiso para usar datos sin restricción cuando Reducir datos está activada</item>
<item quantity="one">1 app tiene permiso para usar datos sin restricción cuando Reducir datos está activada</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 133b8d2..669cd50 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Datankäyttöraja"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty välillä <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Määritä"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Muut datan käyttöön laskettavat sovellukset"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sovellusta saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
<item quantity="one">1 sovellus saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6e01f78..b74760c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Limite de consommation données"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Configurer"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans la consommation"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application autorisée à utiliser des données illimitées lorsque l\'économiseur de données est activé</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications autorisées à utiliser des données illimitées lorsque l\'économiseur de données est activé</item>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index a60342e..c9c7dfa 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Gagnamörk"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> notuð milli <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Stilla"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Önnur forrit talin með í notkun"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> forrit má nota ótakmörkuð gögn þegar kveikt er á gagnasparnaði</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> forrit mega nota ótakmörkuð gögn þegar kveikt er á gagnasparnaði</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index e7ece6f..9768d44 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Деректер шегі"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> арасында пайдаланылған"</string>
<string name="configure" msgid="1029654422228677273">"Конфигурациялау"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Басқа қолданбалар қолданысқа қосылды"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">Трафикті үнемдеу функциясы қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
<item quantity="one">Трафикті үнемдеу функциясы қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b220ec7..de3144c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"데이터 한도"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
<string name="configure" msgid="1029654422228677273">"설정"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"사용량이 집계된 기타 앱"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">데이터 절약 모드가 켜져 있을 때 <xliff:g id="COUNT">%1$d</xliff:g>개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
<item quantity="one">데이터 절약 모드가 켜져 있을 때 1개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 9e5e983..0059f34 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"ഡാറ്റാ പരിധി"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> എന്നീ തീയതികൾക്ക് ഇടയിൽ <xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
<string name="configure" msgid="1029654422228677273">"കോൺഫിഗർ ചെയ്യുക"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"ഉപയോഗത്തിൽ ഉൾപ്പെട്ട മറ്റ് ആപ്സ്"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിമിതിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് <xliff:g id="COUNT">%1$d</xliff:g> ആപ്സിനെ അനുവദിച്ചു</item>
<item quantity="one">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിമിതിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് ഒരു ആപ്പിനെ അനുവദിച്ചു</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8aca6a6..0fd00b0 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Had data"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Konfigurasikan"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Apl lain yang termasuk dalam penggunaan"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apl dibenarkan menggunakan data tanpa had apabila Penjimat Data dihidupkan</item>
<item quantity="one">1 apl dibenarkan menggunakan data tanpa had apabila Penjimat Data dihidupkan</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6d9c468..25f5ca8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt i tidsrommet <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apper som er inkludert i bruken"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apper kan bruke ubegrenset med data når Datasparing er på</item>
<item quantity="one">1 app kan bruke ubegrenset med data når Datasparing er på</item>
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa-rIN/arrays.xml
index e45eca2..d3759bb 100644
--- a/res/values-pa-rIN/arrays.xml
+++ b/res/values-pa-rIN/arrays.xml
@@ -67,7 +67,7 @@
</string-array>
<string-array name="wifi_status">
<item msgid="1922181315419294640"></item>
- <item msgid="8934131797783724664">"ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</item>
+ <item msgid="8934131797783724664">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</item>
<item msgid="8513729475867537913">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
<item msgid="515055375277271756">"ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
<item msgid="1943354004029184381">"IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ..."</item>
@@ -81,7 +81,7 @@
</string-array>
<string-array name="wifi_status_with_ssid">
<item msgid="7714855332363650812"></item>
- <item msgid="8878186979715711006">"ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</item>
+ <item msgid="8878186979715711006">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</item>
<item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
<item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
<item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
@@ -160,7 +160,7 @@
</string-array>
<string-array name="usage_stats_display_order_types">
<item msgid="2100172576767439288">"ਵਰਤੋਂ ਸਮਾਂ"</item>
- <item msgid="4796160515314745154">"ਆਖ਼ਰੀ ਵਾਰ ਵਰਤਿਆ"</item>
+ <item msgid="4796160515314745154">"ਆਖਰੀ ਵਾਰ ਵਰਤਿਆ"</item>
<item msgid="2502754479975776899">"ਐਪ ਦਾ ਨਾਮ"</item>
</string-array>
<string-array name="wifi_eap_entries">
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 64d57ec..0b69d07 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Configurar"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 64d57ec..0b69d07 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Configurar"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c38ef8c..4f24c7e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3078,8 +3078,7 @@
<string name="data_limit" msgid="1885406964934590552">"Установить лимит трафика"</string>
<string name="data_usage_template" msgid="392191945602400904">"Использовано за период <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Настроить"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Другие приложения"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> приложение может без ограничений передавать данные в режиме экономии трафика</item>
<item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> приложения могут без ограничений передавать данные в режиме экономии трафика</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c8e15fd..d2442e7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3078,8 +3078,7 @@
<string name="data_limit" msgid="1885406964934590552">"Dátový limit"</string>
<string name="data_usage_template" msgid="392191945602400904">"V období <xliff:g id="ID_2">%2$s</xliff:g> ste využili <xliff:g id="ID_1">%1$s</xliff:g> dát"</string>
<string name="configure" msgid="1029654422228677273">"Konfigurovať"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Iné aplikácie zahrnuté v prehľade spotreby dát"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie majú povolené používať neobmedzené dáta, keď je zapnutý Šetrič dát</item>
<item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie má povolené používať neobmedzené dáta, keď je zapnutý Šetrič dáta</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c81bbc9..9e08042 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3078,7 +3078,7 @@
<string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
<string name="data_usage_template" msgid="392191945602400904">"Uporabljeno: <xliff:g id="ID_1">%1$s</xliff:g> v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Konfiguriranje"</string>
- <string name="data_usage_other_apps" msgid="3272872663517382050">"Prikaz porabe vključuje druge aplikacije"</string>
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije, vključene v prikaz porabe"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one">Ko je vklopljeno varčevanje s podatki, je neomejen prenos podatkov dovoljen <xliff:g id="COUNT">%1$d</xliff:g> aplikaciji.</item>
<item quantity="two">Ko je vklopljeno varčevanje s podatki, je neomejen prenos podatkov dovoljen <xliff:g id="COUNT">%1$d</xliff:g> aplikacijama.</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fc41cac..6ae2b9a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -3047,8 +3047,7 @@
<string name="data_limit" msgid="1885406964934590552">"Ограничење за потрошњу података"</string>
<string name="data_usage_template" msgid="392191945602400904">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g> у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"Конфигуришите"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Друге апликације укључене у употребу"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозволу да користи неограничену количину података када је Уштеда података укључена</item>
<item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> апликације имају дозволу да користе неограничену количину података када је Уштеда података укључена</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1df6276..30f011a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"ขีดจำกัดอินเทอร์เน็ต"</string>
<string name="data_usage_template" msgid="392191945602400904">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g> ระหว่างวันที่ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"กำหนดค่า"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"แอปอื่นๆ ที่รวมอยู่ในการใช้งาน"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
<item quantity="one">1 แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 982274d..7c2daf9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1365,7 +1365,7 @@
<string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Kapareho ng screen lock ng device"</string>
<string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
<string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
- <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
+ <string name="applications_settings" msgid="1721442176406964682">"Mga App"</string>
<string name="applications_settings_summary" msgid="6683465446264515367">"Pamahalaan ang apps, mag-set up ng mga shortcut ng mabilisang paglunsad"</string>
<string name="applications_settings_header" msgid="1014813055054356646">"Mga setting ng app"</string>
<string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Limitasyon ng data"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"I-configure"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Iba pang mga app na kasama sa paggamit"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> app ang pinapayagang gumamit ng hindi pinaghihigpitang data kapag naka-on ang Data Saver</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na app ang pinapayagang gumamit ng hindi pinaghihigpitang data kapag naka-on ang Data Saver</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fd274b3..9b17271 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> tarihleri arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
<string name="configure" msgid="1029654422228677273">"Yapılandır"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"Kullanıma dahil olan diğer uygulamalar"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">Veri Tasarrufu açıkken <xliff:g id="COUNT">%1$d</xliff:g> uygulamanın sınırsız veri kullanmasına izin veriliyor</item>
<item quantity="one">Veri Tasarrufu açıkken 1 uygulamanın sınırsız veri kullanmasına izin veriliyor</item>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index d23ee25..0a77bc5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"ڈیٹا کی حد"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> کے درمیان <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
<string name="configure" msgid="1029654422228677273">"کنفیگر کریں"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"استعمال میں شامل دیگر ایپس"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">ڈیٹا سیور آن ہو تو <xliff:g id="COUNT">%1$d</xliff:g> ایپس کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
<item quantity="one">ڈیٹا سیور آن ہو تو 1 ایپ کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 1d1e571..7854c7d 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -49,7 +49,7 @@
<item msgid="6415509612413178727">"30 daqiqa"</item>
</string-array>
<string-array name="lock_after_timeout_entries">
- <item msgid="8929270399652145290">"darhol"</item>
+ <item msgid="8929270399652145290">"Darhol"</item>
<item msgid="6736512735606834431">"5 soniya"</item>
<item msgid="8044619388267891375">"15 soniya"</item>
<item msgid="1822002388249545488">"30 soniya"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3a06754..a30e5ab 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3016,8 +3016,7 @@
<string name="data_limit" msgid="1885406964934590552">"流量上限"</string>
<string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="configure" msgid="1029654422228677273">"配置"</string>
- <!-- no translation found for data_usage_other_apps (3272872663517382050) -->
- <skip />
+ <string name="data_usage_other_apps" msgid="3272872663517382050">"其他消耗流量的应用"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
<item quantity="other">已允许 <xliff:g id="COUNT">%1$d</xliff:g> 个应用在流量节省程序开启时无限量使用数据流量。</item>
<item quantity="one">已允许 1 个应用在流量节省程序开启时无限量使用数据流量。</item>
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index ebc0b1c..d309867 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -90,6 +90,7 @@
import android.widget.ListView;
import android.widget.TabWidget;
import com.android.internal.app.UnlaunchableAppActivity;
+import com.android.internal.util.ArrayUtils;
import com.android.internal.util.UserIcons;
import java.io.IOException;
@@ -1024,12 +1025,13 @@
* @throws SecurityException if the given userId does not belong to the current user group.
*/
public static int enforceSameOwner(Context context, int userId) {
- UserManager um = getUserManager(context);
- if (!um.getUserProfiles().contains(new UserHandle(userId))) {
- throw new SecurityException("Given user id " + userId + " does not belong to user "
- + UserHandle.myUserId());
+ final UserManager um = getUserManager(context);
+ final int[] profileIds = um.getProfileIdsWithDisabled(UserHandle.myUserId());
+ if (ArrayUtils.contains(profileIds, userId)) {
+ return userId;
}
- return userId;
+ throw new SecurityException("Given user id " + userId + " does not belong to user "
+ + UserHandle.myUserId());
}
/**
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 355031d..4e2ebce 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -30,6 +30,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
+import android.os.storage.StorageManager;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.LayoutInflater;
@@ -191,6 +192,16 @@
mSwitchBar.setCheckedInternal(checked);
}
+ /**
+ * Return whether the device is encrypted with legacy full disk encryption. Newer devices
+ * should be using File Based Encryption.
+ *
+ * @return true if device is encrypted
+ */
+ private boolean isFullDiskEncrypted() {
+ return StorageManager.isNonDefaultBlockEncrypted();
+ }
+
private View createEnableDialogContentView(AccessibilityServiceInfo info) {
LayoutInflater inflater = (LayoutInflater) getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
@@ -200,7 +211,7 @@
TextView encryptionWarningView = (TextView) content.findViewById(
R.id.encryption_warning);
- if (LockPatternUtils.isDeviceEncrypted()) {
+ if (isFullDiskEncrypted()) {
String text = getString(R.string.enable_service_encryption_warning,
info.getResolveInfo().loadLabel(getPackageManager()));
encryptionWarningView.setText(text);
@@ -273,7 +284,7 @@
// The user confirmed that they accept weaker encryption when
// enabling the accessibility service, so change encryption.
// Since we came here asynchronously, check encryption again.
- if (LockPatternUtils.isDeviceEncrypted()) {
+ if (isFullDiskEncrypted()) {
mLockPatternUtils.clearEncryptionPassword();
Settings.Global.putInt(getContentResolver(),
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, 0);
@@ -290,7 +301,7 @@
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
if (mShownDialogId == DIALOG_ID_ENABLE_WARNING) {
- if (LockPatternUtils.isDeviceEncrypted()) {
+ if (isFullDiskEncrypted()) {
String title = createConfirmCredentialReasonMessage();
Intent intent = ConfirmDeviceCredentialActivity.createIntent(title, null);
startActivityForResult(intent,