Merge "Convert more of StatusFragment to PreferenceControllers"
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 9890e68..fb6c78b 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -109,8 +109,8 @@
android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
- android:layout_width="@dimen/fingerprint_progress_bar_max_size"
- android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:layout_marginVertical="24dp">
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 5683840..7780b31 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -31,14 +31,15 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView android:id="@+id/android_beam_explained"
+ <TextView
+ android:id="@+id/android_beam_explained"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:gravity="top"
+ android:paddingStart="@dimen/preference_no_icon_padding_start"
android:text="@string/android_beam_explained"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView android:id="@+id/android_beam_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/data_usage_spinner_item.xml b/res/layout/data_usage_spinner_item.xml
new file mode 100644
index 0000000..1706edf
--- /dev/null
+++ b/res/layout/data_usage_spinner_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Copied from frameworks/base/core/res/res/layout/simple_spinner_item.xml and modified
+ layout height and added padding. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ style="?android:attr/spinnerItemStyle"
+ android:singleLine="true"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:ellipsize="marquee"
+ android:textAlignment="inherit"
+ android:gravity="center"
+ android:paddingStart="30dp"
+ android:paddingEnd="30dp"/>
\ No newline at end of file
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index ec2aaea..779e504 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,24 +14,24 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- >
+ android:orientation="vertical">
<ScrollView
android:id="@+id/master_clear_scrollview"
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginStart="12dp"
+ android:layout_marginStart="@dimen/preference_no_icon_padding_start"
android:layout_marginEnd="12dp"
android:layout_marginTop="12dp"
android:layout_weight="1">
- <LinearLayout android:id="@+id/master_clear_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ <LinearLayout
+ android:id="@+id/master_clear_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 82769db..be966dd 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -22,7 +22,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginStart="12dp"
+ android:layout_marginStart="@dimen/preference_no_icon_padding_start"
android:layout_marginEnd="12dp"
android:layout_marginTop="12dp"
android:layout_weight="1">
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index e2dd13a..2adfab3 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -33,26 +33,27 @@
android:layout_width="@dimen/dashboard_tile_image_size"
android:layout_height="@dimen/dashboard_tile_image_size"
android:layout_marginStart="14dp"
- android:layout_marginEnd="24dp"/>
+ android:layout_marginEnd="24dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView android:id="@android:id/title"
+ <TextView
+ android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.TileTitle"
android:ellipsize="marquee"
- android:fadingEdge="horizontal"/>
+ android:fadingEdge="horizontal" />
- <TextView android:id="@android:id/summary"
+ <TextView
+ android:id="@android:id/summary"
+ android:textAppearance="@style/TextAppearance.SuggestionSummary"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Small"
- android:textColor="?android:attr/textColorSecondary"/>
+ android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
new file mode 100644
index 0000000..0439770
--- /dev/null
+++ b/res/layout/suggestion_tile_with_button.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/white"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:paddingStart="16dp"
+ android:paddingEnd="12dp"
+ android:paddingBottom="20dp"
+ android:paddingTop="16dp"
+ android:orientation="horizontal"
+ android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ android:contentDescription="@null" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:layout_marginStart="18dp"
+ android:layout_marginTop="2dp"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/TextAppearance.SuggestionTitle"
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp" />
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="6dp"
+ android:layout_marginEnd="50dp"
+ android:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+ <Button
+ android:id="@android:id/primary"
+ style="@style/SuwGlifButton.Primary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:text="@string/suggestion_button_text" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 39b14a3..17b23fb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wanneer skerm af is"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wanneer skerm aan of af is"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Voer admin-PIN in"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Kan stelselinstellings verander"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Verander stelselinstellings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Programtoestemming om stelselinstellings te verander"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Mag stelselinstellings verander"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Hierdie toestemming laat \'n program toe om stelselinstellings te verander."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6e192c6..0464d72 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ማያ ገጹ ሲጠፋ"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ማያ ገጹ ሲበራ ወይም ሲጠፋ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"የአስተዳዳሪ ፒን ያስገቡ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"በርቷል"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"የስርዓት ቅንብሮችን ያዘምናል"</string>
<string name="write_system_settings" msgid="3482913590601096763">"የስርዓት ቅንብሮችን ይቀይራል"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"መተግበሪያ የስርዓት ቅንብሮች ፈቃድን ይቀይራል"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"የስርዓት ቅንብሮችን ለማዘመን ያስችላል"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ይህ ፈቃድ መተግበሪያው የስርዓት ቅንብሮችን ለመቀየር ያስችለዋል።"</string>
<string name="write_settings_on" msgid="8230580416068832239">"አዎ"</string>
<string name="write_settings_off" msgid="5156104383386336233">"አይ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ffa30fd..b434cba 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3187,6 +3187,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"عندما تكون الشاشة في وضع الإيقاف"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"عندما تكون الشاشة في وضع التشغيل أو الإيقاف"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"إدخال رقم التعريف الشخصي للمشرف"</string>
<string name="switch_on_text" msgid="1124106706920572386">"تشغيل"</string>
@@ -3466,7 +3468,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"إمكانية تعديل إعدادات النظام"</string>
<string name="write_system_settings" msgid="3482913590601096763">"تعديل إعدادات النظام"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"إذن تعديل التطبيق لإعدادات النظام"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"السماح بتعديل إعدادات النظام"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"يتيح هذا الإذن للتطبيق إمكانية تعديل إعدادات النظام."</string>
<string name="write_settings_on" msgid="8230580416068832239">"نعم"</string>
<string name="write_settings_off" msgid="5156104383386336233">"لا"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 1b3ace9..aa7b528 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran qapalı olduğu zaman"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran açıq və ya qapalı olduğu zaman"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Admin PIN kodunu daxil edin"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aktiv"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını dəyişdirə bilər"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarında dəyişiklik edin"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Tətbiqin sistem ayarlarını dəyişdirmə icazəsi"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Sistem ayarlarını dəyişdirməyə imkan verin"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0040ca9..f204afe 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2015,8 +2015,8 @@
<!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
<skip />
<string name="awake" msgid="387122265874485088">"Vreme buđenja uređaja"</string>
- <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vreme"</string>
- <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vreme"</string>
+ <string name="wifi_on_time" msgid="3208518458663637035">"Vreme od uključivanja Wi-Fi mreže"</string>
+ <string name="bluetooth_on_time" msgid="3056108148042308690">"Vreme od uključivanja Wi-Fi mreže"</string>
<string name="advanced_battery_title" msgid="2068039111517508622">"Napredna potrošnja baterije"</string>
<string name="history_details_title" msgid="3608240585315506067">"Detalji istorije"</string>
<string name="battery_details_title" msgid="6101394441569858580">"Potrošnja baterije"</string>
@@ -3088,6 +3088,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran uključen ili isključen"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Podešavanja obaveštenja"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Šalji povratne informacije o uređaju"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Mogu da menjaju podešavanja sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Menjanje podešavanja sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za menjanje podešavanja sistema za aplikaciju"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli menjanje podešavanja sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Ova dozvola dozvoljava aplikaciji da menja podešavanja sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5658004..261d77f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1497,10 +1497,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Задайце блакіроўку экрана"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Для большай бяспекі задайце пароль"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Каб карыст. адбіткам пальца, задайце пароль"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Каб карыст. адбіткам пальца, задайце ўзор"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Для большай бяспекі задайце PIN-код"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Каб карыст. адбіт. пал., задайце PIN-код"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Для большай бяспекі задайце ўзор"</string>
@@ -3124,6 +3122,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Калі экран выключаны"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Калі экран уключаны або выключаны"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Налады апавяшчэнняў"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Адправіць водгук пра гэту прыладу"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Увядзіце PIN-код адміністратара"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Уключана"</string>
@@ -3390,7 +3390,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Якія могуць змяняць сістэмныя налады"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Змена сістэмных налад"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Дазвол змены сістэмных налад для дадатку"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Дазволіць змяняць сістэмныя налады"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Гэта дазваляе дадатку змяняць сістэмныя налады."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9f90046..97ddf03 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При изключен екран"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включен или изключен екран"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Въведете администраторския ПИН код"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Включено"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Възможност за промяна на системните настройки"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Промяна на сист. настройки"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Промяна на системните настройки от приложения"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Разрешаване на промяна на сист. настройки"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Това разрешение позволява на дадено приложение да променя системните настройки."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f104b37..3df4264 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"লোড হচ্ছে..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"একটি স্ক্রিন লক সেট করুন"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"নিরাপত্তার জন্য একটি পাসওয়ার্ড সেট করুন"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"আঙ্গুলের ছাপ ব্যবহার করতে পাসওয়ার্ড সেট করুন"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"আঙ্গুলের ছাপ ব্যবহার করতে প্যাটার্ন সেট করুন"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"আঙ্গুলের ছাপ ব্যবহার করতে পিন সেট করুন"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"নিরাপত্তার জন্য একটি প্যাটার্ন সেট করুন"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"যখন স্ক্রীন বন্ধ থাকে"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"যখন স্ক্রীন চালু বা বন্ধ থাকে"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"প্রশাসকের পিন লিখুন"</string>
<string name="switch_on_text" msgid="1124106706920572386">"চালু করুন"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"সিস্টেম সেটিংস সংশোধন করতে পারে"</string>
<string name="write_system_settings" msgid="3482913590601096763">"সিস্টেম সেটিংস সংশোধন করুন"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"অ্যাপ্লিকেশানটি সিস্টেম সেটিংসের অনুমতি সংশোধন করে"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"সিস্টেম সেটিংস সংশোধন করার অনুমতি দিন"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"এই অনুমতিটি কোনো অ্যাপ্লিকেশানকে সিস্টেম সেটিংস সংশোধন করার অনুমতি দেয়৷"</string>
<string name="write_settings_on" msgid="8230580416068832239">"হ্যাঁ"</string>
<string name="write_settings_off" msgid="5156104383386336233">"না"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 30ccc9e..851853c 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -370,9 +370,9 @@
<string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
<string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom prsta"</string>
<string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Koristite otisak prsta"</string>
- <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikaciju. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikaciju. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
<string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
- <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN koda."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
<string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
@@ -511,7 +511,7 @@
</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
<string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcija zaštite uređaja neće raditi bez PIN-a."</string>
- <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaštitu uređaja neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaštitu uređaja neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
<string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcija zaštite uređaja neće raditi bez lozinke."</string>
@@ -527,7 +527,7 @@
</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
<string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije za zaštitu profila neće funkcionirati bez PIN-a."</string>
- <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaštitu profila neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaštitu profila neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
<string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije za zaštitu profila neće funkcionirati bez lozinke."</string>
@@ -545,13 +545,13 @@
<string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> pokušaja."</string>
<string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši podaci će se izbrisati"</string>
<string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"Ako u sljedećem pokušaju unesete neispravan obrazac, podaci ovog uređaja će se izbrisati"</string>
- <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, podaci ovog uređaja će se izbrisati"</string>
+ <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ako u sljedećem pokušaju unesete neispravan PIN, podaci ovog uređaja će se izbrisati"</string>
<string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ako u sljedećem pokušaju unesete neispravnu lozinku, podaci ovog uređaja će se izbrisati"</string>
<string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako u sljedećem pokušaju unesete neispravan obrazac, ovaj korisnik će se izbrisati"</string>
- <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, ovaj korisnik će se izbrisati"</string>
+ <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sljedećem pokušaju unesete neispravan PIN, ovaj korisnik će se izbrisati"</string>
<string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako u sljedećem pokušaju unesete neispravnu lozinku, ovaj korisnik će se izbrisati"</string>
<string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako u sljedećem pokušaju unesete neispravan obrazac, vaš radni profil i njegovi podaci će se izbrisati"</string>
- <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, vaš radni profil i njegovi podaci će se izbrisati"</string>
+ <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sljedećem pokušaju unesete neispravan PIN, vaš radni profil i njegovi podaci će se izbrisati"</string>
<string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako u sljedećem pokušaju unesete neispravnu lozinku, vaš radni profil i njegovi podaci će se izbrisati"</string>
<string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"Previše je neispravnih pokušaja. Podaci ovog uređaja će se izbrisati."</string>
<string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše je neispravnih pokušaja. Ovaj korisnik će se izbrisati."</string>
@@ -563,7 +563,7 @@
<string name="lockpassword_password_too_long" msgid="4591720174765403476">"Ukupan broj znakova mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>"</string>
<string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Ukupan broj cifara mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>"</string>
<string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Mora sadržavati isključivo cifre 0-9."</string>
- <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN koda"</string>
+ <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a"</string>
<string name="lockpassword_illegal_character" msgid="8049611046639943217">"Ne može sadržavati nevažeći znak"</string>
<string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Mora sadržavati najmanje jedno slovo"</string>
<string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Mora sadržavati najmanje jednu cifru"</string>
@@ -946,7 +946,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Prednost ima Wi-Fi"</item>
+ <item msgid="5782108782860004851">"Preferira se Wi-Fi"</item>
<item msgid="5074515506087318555">"Preferira se mobilna mreža"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1113,7 +1113,7 @@
<string name="sim_reenter_new" msgid="6523819386793546888">"Ponovo unesite novi PIN"</string>
<string name="sim_change_pin" msgid="7328607264898359112">"PIN za SIM"</string>
<string name="sim_bad_pin" msgid="2345230873496357977">"Pogrešan PIN"</string>
- <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN kodovi se ne podudaraju"</string>
+ <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN-ovi se ne podudaraju"</string>
<string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promijeniti PIN.\nMožda je PIN neispravan."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN za SIM uspješno promijenjen"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Ne možete otključati SIM.\nPIN je možda pogrešan."</string>
@@ -1125,11 +1125,11 @@
<string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos mobilnih podataka koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
<string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati željenu SIM karticu?"</string>
<string name="sim_preferred_message" msgid="8466930554330635780">"SIM kartica <xliff:g id="NEW_SIM">%1$s</xliff:g> jedina je SIM kartica u vašem uređaju. Želite li tu SIM karticu koristiti za prijenos mobilnih podataka, pozive i SMS poruke?"</string>
- <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"PIN kôd za SIM je netačan. Za otključavanje uređaja sada morate kontaktirati svog operatera."</string>
+ <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"PIN za SIM je netačan. Za otključavanje uređaja sada morate kontaktirati svog operatera."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
- <item quantity="one">PIN kôd za SIM je netačan. Preostao vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
- <item quantity="few">PIN kôd za SIM je netačan. Preostala su vam još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
- <item quantity="other">PIN kôd za SIM je netačan. Preostalo vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+ <item quantity="one">PIN za SIM je netačan. Preostao vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
+ <item quantity="few">PIN za SIM je netačan. Preostala su vam još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+ <item quantity="other">PIN za SIM je netačan. Preostalo vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
</plurals>
<string name="pin_failed" msgid="1848423634948587645">"Operacija PIN-a za SIM nije uspjela!"</string>
<string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tableta"</string>
@@ -1485,12 +1485,12 @@
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Postavite lozinku radi sigurnosti"</string>
<string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Da koristite otisak prsta, postavite lozinku"</string>
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Da koristite otisak prsta, postavite uzorak"</string>
- <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Postavite PIN kôd radi sigurnosti"</string>
- <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Da koristite otisak prsta, postavite PIN kôd"</string>
+ <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Postavite PIN radi sigurnosti"</string>
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Da koristite otisak prsta, postavite PIN"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Postavite uzorak radi sigurnosti"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
- <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN kôd"</string>
+ <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lozinke se ne podudaraju"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
<string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vrste otključavanja"</string>
@@ -1504,16 +1504,16 @@
<string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Za nastavak, unesite radni PIN."</string>
<string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Za nastavak, unesite radnu lozinku."</string>
<string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Za dodatnu sigurnost, unesite uzorak uređaja"</string>
- <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost, unesite PIN kôd uređaja"</string>
+ <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost, unesite PIN uređaja"</string>
<string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Za dodatnu sigurnost, unesite lozinku uređaja"</string>
<string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za dodatnu sigurnost, unesite radni uzorak"</string>
- <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost, unesite radni PIN kôd"</string>
+ <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost, unesite radni PIN"</string>
<string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za dodatnu sigurnost, unesite radnu lozinku"</string>
<string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodni obrazac."</string>
- <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodni PIN kôd."</string>
+ <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodni PIN."</string>
<string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodnu lozinku."</string>
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potvrdite obrazac"</string>
- <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potvrdite PIN kôd"</string>
+ <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potvrdite PIN"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potvrdite lozinku"</string>
<string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
<string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
@@ -3088,8 +3088,10 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran isključen ili uključen"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke za obavještenja"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Slanje informacija o uređaju"</string>
- <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite PIN kôd administratora"</string>
+ <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite PIN administratora"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</string>
<string name="screen_pinning_title" msgid="2292573232264116542">"Kačenje ekrana"</string>
@@ -3103,7 +3105,7 @@
<string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
<string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
<string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
- <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN kôd prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN kôd?"</string>
+ <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN?"</string>
<string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Uređaj možete dodatno zaštiti tako što ćete tražiti unošenje uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži unošenje uzorka?"</string>
<string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
<string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja PIN-a prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva PIN?"</string>
@@ -3242,7 +3244,7 @@
<item quantity="other">Aplikacije prazne bateriju</item>
</plurals>
<string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
- <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
+ <string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
<string name="high_power_system" msgid="7362862974428225301">"Optimizacija baterije je nedostupna"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Ne primjenjuje se optimizacija baterije. Tako se baterija može brže isprazniti."</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Izmjeni postavke sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za izmjenu postavki sistema aplikacije"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli izmijenu postavki sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Ovo odobrenje omogućava aplikaciji da izmijeni postavke sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 5cf72a3..bc9e015 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -149,7 +149,7 @@
</string-array>
<string-array name="usage_stats_display_order_types">
<item msgid="2100172576767439288">"Temps d\'ús"</item>
- <item msgid="4796160515314745154">"Darrera vegada que es va fer servir"</item>
+ <item msgid="4796160515314745154">"Darrer ús"</item>
<item msgid="2502754479975776899">"Nom de l\'aplicació"</item>
</string-array>
<string-array name="wifi_eap_entries">
@@ -316,15 +316,15 @@
<item msgid="2154671955760380322">"Notificació de la publicació"</item>
<item msgid="4282477730595931828">"Ubicació"</item>
<item msgid="4891423912898525905">"Trucada"</item>
- <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
- <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
+ <item msgid="2623604824935968113">"Llegeix SMS/MMS"</item>
+ <item msgid="4420177125221176306">"Escriu SMS/MMS"</item>
<item msgid="3986142739951490025">"Rep SMS/MMS"</item>
<item msgid="3984213795861739778">"Rep SMS/MMS"</item>
<item msgid="3656243523752472788">"Rep SMS/MMS"</item>
<item msgid="8105802370238551510">"Rep SMS/MMS"</item>
<item msgid="1407766984645388488">"Envia SMS/MMS"</item>
- <item msgid="3527273606643794973">"Llegeix l\'SMS/MMS"</item>
- <item msgid="4370895547001583812">"Escriu un SMS/MMS"</item>
+ <item msgid="3527273606643794973">"Llegeix SMS/MMS"</item>
+ <item msgid="4370895547001583812">"Escriu SMS/MMS"</item>
<item msgid="4218544235221631789">"Modifica la configuració"</item>
<item msgid="736541391767350377">"Dibuixa a sobre"</item>
<item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 09b1877..4751d56 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -919,7 +919,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferència en itinerància"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Preferència per la Wi-Fi"</item>
+ <item msgid="2124257075906188844">"Preferència per a la Wi-Fi"</item>
<item msgid="1335127656328817518">"Preferència per a dades mòbils"</item>
<item msgid="3132912693346866895">"Només Wi-Fi"</item>
</string-array>
@@ -934,7 +934,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Preferència per la Wi-Fi"</item>
+ <item msgid="5782108782860004851">"Preferència per a la Wi-Fi"</item>
<item msgid="5074515506087318555">"Preferència per a dades mòbils"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1007,9 +1007,9 @@
<string name="accelerometer_title" msgid="7854608399547349157">"Gira pantalla automàticament"</string>
<string name="color_mode_title" msgid="3159275920408338215">"Colors vius"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Canvia l\'orientació automàticament en girar la tauleta"</string>
- <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+ <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia l\'orientació automàticament en girar el telèfon"</string>
<string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
- <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+ <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia l\'orientació automàticament en girar el telèfon"</string>
<string name="brightness" msgid="8480105032417444275">"Nivell de brillantor"</string>
<string name="brightness_title" msgid="5746272622112982836">"Brillantor"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
@@ -1088,9 +1088,9 @@
<string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloquejada"</string>
<string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
<string name="sim_pin_toggle" msgid="1742123478029451888">"Bloqueja la targeta SIM"</string>
- <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Necessites el PIN per utilitzar la tauleta"</string>
+ <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Sol·licita el PIN per utilitzar la tauleta"</string>
<string name="sim_lock_on" product="default" msgid="2503536505568814324">"Sol·licita el PIN per utilitzar el telèfon"</string>
- <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigeix el PIN per utilitzar la tauleta"</string>
+ <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Sol·licita el PIN per utilitzar la tauleta"</string>
<string name="sim_lock_off" product="default" msgid="258981978215428916">"Sol·licita el PIN per utilitzar el telèfon"</string>
<string name="sim_pin_change" msgid="6311414184279932368">"Canvia el PIN de la SIM"</string>
<string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la SIM"</string>
@@ -1699,7 +1699,7 @@
<string name="running_processes_header_footer" msgid="723908176275428442">"RAM utilitzada per aplicacions"</string>
<string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Sistema"</string>
<string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplicacions"</string>
- <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Disponible"</string>
+ <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Lliure"</string>
<string name="running_processes_header_used_prefix" msgid="5924288703085123978">"En ús"</string>
<string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"A la memòria cau"</string>
<string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> de RAM"</string>
@@ -1807,7 +1807,7 @@
<string name="testing_usage_stats" msgid="7823048598893937339">"Estadístiques d\'ús"</string>
<string name="display_order_text" msgid="8592776965827565271">"Ordena per:"</string>
<string name="app_name_label" msgid="5440362857006046193">"Aplicació"</string>
- <string name="last_time_used_label" msgid="8459441968795479307">"Darrera vegada que es va fer servir"</string>
+ <string name="last_time_used_label" msgid="8459441968795479307">"Darrer ús"</string>
<string name="usage_time_label" msgid="295954901452833058">"Temps d\'ús"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
@@ -2130,7 +2130,7 @@
<string name="process_stats_type_cached" msgid="6314925846944806511">"Memòria"</string>
<string name="process_stats_os_label" msgid="4813434110442733392">"SO Android"</string>
<string name="process_stats_os_native" msgid="5322428494231768472">"Nadiu"</string>
- <string name="process_stats_os_kernel" msgid="1938523592369780924">"Nucli"</string>
+ <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
<string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
<string name="process_stats_os_cache" msgid="6432533624875078233">"Memòries cau"</string>
<string name="process_stats_ram_use" msgid="976912589127397307">"Ús de memòria RAM"</string>
@@ -2142,11 +2142,11 @@
<string name="mem_details_title" msgid="6548392825497290498">"Detalls de la memòria"</string>
<string name="mem_state_subtitle" msgid="2407238869781011933">"Estats de la memòria"</string>
<string name="mem_use_subtitle" msgid="7319468770222422412">"Ús de la memòria"</string>
- <string name="mem_use_kernel_type" msgid="8698327165935012484">"Nucli"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
<string name="mem_use_native_type" msgid="5976704902328347400">"Nadiu"</string>
<string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Memòries cau del nucli"</string>
<string name="mem_use_zram_type" msgid="9087217476795358232">"Espai compartit ZRam"</string>
- <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Lliure"</string>
<string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
@@ -2387,7 +2387,7 @@
<string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Targetes SIM"</string>
<string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Xarxes mòbils"</string>
<string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"En pausa al límit"</string>
- <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronitza dades automàt."</string>
+ <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronització automàtica de dades"</string>
<string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sincr. dades personals autom."</string>
<string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincron. dades feina automàt."</string>
<string name="data_usage_change_cycle" msgid="7776556448920114866">"Canvia el cicle..."</string>
@@ -2734,7 +2734,7 @@
<string name="sim_notification_title" msgid="6272913297433198340">"S\'han canviat les targetes SIM"</string>
<string name="sim_notification_summary" msgid="8858043655706669772">"Toca per configurar"</string>
<string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida per a"</string>
- <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Demana-m\'ho cada vegada"</string>
+ <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pregunta sempre"</string>
<string name="sim_selection_required_pref" msgid="3446721423206414652">"Has de seleccionar una preferència."</string>
<string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
<plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quan la pantalla està desactivada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quan la pantalla està activada o desactivada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introdueix el PIN d\'administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3155,7 +3157,7 @@
<item quantity="one">1 aplicació que permet obrir enllaços compatibles</item>
</plurals>
<string name="app_link_open_always" msgid="2474058700623948148">"Obre en aquesta aplicació"</string>
- <string name="app_link_open_ask" msgid="7800878430190575991">"Demana-m\'ho cada vegada"</string>
+ <string name="app_link_open_ask" msgid="7800878430190575991">"Pregunta sempre"</string>
<string name="app_link_open_never" msgid="3407647600352398543">"No obris en aquesta aplicació"</string>
<string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
<string name="default_apps_title" msgid="1660450272764331490">"Predeterminada"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Pot modificar la configuració del sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modificar configuració sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permís aplicació per modificar configuració sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permet modificar la configuració del sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1e1b36e..d35e059 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2220,7 +2220,7 @@
<string name="tts_spoken_language" msgid="5542499183472504027">"Mluvený jazyk"</string>
<string name="tts_install_voices_title" msgid="8808823756936022641">"Instalace hlasů"</string>
<string name="tts_install_voices_text" msgid="5292606786380069134">"Pokračujte do aplikace <xliff:g id="TTS_APP_NAME">%s</xliff:g> a nainstalujte hlasy"</string>
- <string name="tts_install_voices_open" msgid="667467793360277465">"Otevřít aplikaci"</string>
+ <string name="tts_install_voices_open" msgid="667467793360277465">"Do aplikace"</string>
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Zrušit"</string>
<string name="tts_reset" msgid="2661752909256313270">"Obnovit"</string>
<string name="tts_play" msgid="2628469503798633884">"Přehrát"</string>
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Při vypnuté obrazovce"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Při zapnuté i vypnuté obrazovce"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadejte PIN administrátora"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Zapnuto"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Smí měnit nastavení systému"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Změny nastavení systému"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Oprávnění aplikace ke změnám nastavení systému"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Povolit provádění změn nastavení systému"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fe02c0d..a7064cd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skærmen er slukket"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skærmen er tændt eller slukket"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Indtast administratorpinkoden"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Apps, som kan ændre systemindstillinger"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Rediger systemindstillinger"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Apptilladelse til at ændre systemindstillinger"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Tillad ændring af systemindstillinger"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 510dda5..4dbb376 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1473,7 +1473,7 @@
<string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Alternative für Fingerabdruck einrichten"</string>
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Alternative für Fingerabdruck einrichten"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Richte aus Sicherheitsgründen eine PIN ein"</string>
- <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN vergeben, um Fingerabdruck zu nutzen"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Richte aus Sicherheitsgründen ein Muster ein"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Passwort noch einmal eingeben"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Bei deaktiviertem Display"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Bei aktiviertem oder deaktiviertem Display"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator-PIN eingeben"</string>
<string name="switch_on_text" msgid="1124106706920572386">"An"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Kann Systemeinstellungen ändern"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Systemeinstellungen ändern"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Änderungsberechtigung für Systemeinstellungen"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Änderung von Systemeinstellungen zulassen"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index dcd7122..8e650c0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Όταν η οθόνη είναι απενεργοποιημένη"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Όταν η οθόνη είναι ενεργοποιημένη ή απενεργοποιημένη"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Εισαγωγή PIN διαχειριστή"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Ενεργό"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Δυνατότητα τροποποίησης ρυθμίσεων συστήματος"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Τροποποίηση ρυθμ. συστήματος"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Άδεια εφαρμογής τροποποίησης ρυθμίσεων συστήματος"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Να επιτρέπεται η τροποποίηση ρυθμ. συστήματος"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Αυτή η άδεια επιτρέπει σε μια εφαρμογή την τροποποίηση των ρυθμίσεων συστήματος."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ναι"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Όχι"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e0aba19..81f71c1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3055,6 +3055,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+ <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3306,7 +3307,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index e00c748..ac12738 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3055,6 +3055,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+ <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3306,7 +3307,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e0aba19..81f71c1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3055,6 +3055,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+ <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3306,7 +3307,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e0aba19..81f71c1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3055,6 +3055,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+ <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3306,7 +3307,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index dc06c8b..25bd9a2 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -3054,6 +3054,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+ <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3305,7 +3306,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1333285..5bd8c6c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3053,6 +3053,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Cuando la pantalla está apagada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Cuando la pantalla está encendida o apagada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ingresa el PIN de administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3304,7 +3306,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Puede modificar la configuración del sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modificar config. del sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permiso para modificar la configuración del sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar configuración del sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Este permiso admite que una aplicación modifique la configuración del sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0c060e4..dc14477 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -920,7 +920,7 @@
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
- <item msgid="1335127656328817518">"Preferida para móviles"</item>
+ <item msgid="1335127656328817518">"Preferir datos móviles"</item>
<item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -935,7 +935,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
<item msgid="5782108782860004851">"Preferir Wi-Fi"</item>
- <item msgid="5074515506087318555">"Preferida para móviles"</item>
+ <item msgid="5074515506087318555">"Preferir datos móviles"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Con la pantalla desactivada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Con la pantalla activada o desactivada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introducir el PIN del administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Puede modificar los ajustes del sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modificar ajustes del sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permiso de aplicación para modificar ajustes sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir que se modifiquen ajustes sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 59770c9..fb52cd2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kui ekraan on väljas"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kui ekraan on sees või väljas"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Sisestage administraatori PIN-kood"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Saab muuta süsteemiseadeid"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Süsteemiseadete muutmine"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Rakendustel süsteemiseadete muutmise lubamine"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Luba muuta süsteemiseadeid"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index aaf86a0..3bd2b39 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Pantaila itzalita dagoenean"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Pantaila piztuta nahiz itzalita dagoenean"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Idatzi administratzailearen PIN kodea"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aktibatuta"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Sistemaren ezarpenak alda ditzaketenak"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Aldatu sistemaren ezarpenak"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Aplikazioek sistemaren ezarpenak aldatzeko baimena"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Baimendu sistemaren ezarpenak aldatzea"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8eeee5a..de57a16 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"وقتی صفحهنمایش روشن است"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"وقتی صفحهنمایش روشن یا خاموش است"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"پین سرپرست را وارد کنید"</string>
<string name="switch_on_text" msgid="1124106706920572386">"روشن"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"میتوانند تنظیمات سیستم را تغییر دهند"</string>
<string name="write_system_settings" msgid="3482913590601096763">"تغییر تنظیمات سیستم"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"مجوز تغییر تنظیمات سیستم توسط برنامه"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"اجازه دادن به برنامه برای تغییر تنظیمات سیستم"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"این مجوز به برنامه امکان میدهد تنظیمات سیستم را تغییر دهد."</string>
<string name="write_settings_on" msgid="8230580416068832239">"بله"</string>
<string name="write_settings_off" msgid="5156104383386336233">"نه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2b104c5..c0dc2cb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kun näyttö on pois päältä"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kun näyttö on päällä tai pois päältä"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Anna järjestelmänvalvojan PIN-koodi"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Voi muokata järjestelmäasetuksia"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Muokkaa järjestelmäasetuksia"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Sovelluksen järjestelmäasetusten muokkausoikeus"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Salli järjestelmäasetusten muokkaaminen"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c731c4f..75b71b2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quand l\'écran est allumé ou éteint"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Entrez le NIP d\'administrateur"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres du système"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Autorisation de modifier les paramètres système"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Autoriser la modif. des paramètres du système"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c164a62..2aca836 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Configurer le verrouillage de l\'écran"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Pour des raisons de sécurité, définissez un mot de passe"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pour utiliser empreinte, définissez mot de passe"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pour utiliser empreinte, définissez schéma"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour des raisons de sécurité, définissez un code"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pour utiliser empreinte, définissez code"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour des raisons de sécurité, définissez un schéma"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Lorsque l\'écran est allumé ou éteint"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Saisir le code d\'accès administrateur"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3226,8 +3226,8 @@
<string name="decline_remote_bugreport_action" msgid="518720235407565134">"Refuser"</string>
<string name="usb_use_charging_only" msgid="2180443097365214467">"Recharger cet appareil"</string>
<string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Uniquement pour charger cet appareil"</string>
- <string name="usb_use_power_only" msgid="6426550616883919530">"Alimenter cet appareil en énergie"</string>
- <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Cette méthode ne fonctionne qu\'avec les appareils compatibles avec le rechargement USB."</string>
+ <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir du courant"</string>
+ <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Permet de recharger les appareils connectés compatibles avec le rechargement USB."</string>
<string name="usb_use_file_transfers" msgid="7409600791007250137">"Transférer des fichiers"</string>
<string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transférer des fichiers vers un autre appareil"</string>
<string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres système"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Autorisation modifier paramètres système par applis"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Autoriser modification des paramètres système"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 9ccfa7f..b619da0 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -252,7 +252,7 @@
<item msgid="8181415497109310680">"ler SMS"</item>
<item msgid="6816551144382117307">"escribir SMS"</item>
<item msgid="4600463921908905030">"recibir SMS"</item>
- <item msgid="5958926493289432745">"recibir SMS de emerxencia"</item>
+ <item msgid="5958926493289432745">"recibir SMS de urxencia"</item>
<item msgid="4945269495221089540">"recibir MMS"</item>
<item msgid="5570472453573929087">"recibir WAP push"</item>
<item msgid="7125408150230860501">"enviar SMS"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0f7156f..23673dc 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -56,7 +56,7 @@
<string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Rexistro de IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nVoz por LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nVoz por wifi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideochamada: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nInterface de UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
<string name="radioInfo_service_in" msgid="1697703164394784618">"En servizo"</string>
<string name="radioInfo_service_out" msgid="7999094221728929681">"Fóra de servizo"</string>
- <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de emerxencia"</string>
+ <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de urxencia"</string>
<string name="radioInfo_service_off" msgid="7536423790014501173">"Radio desactivada"</string>
<string name="radioInfo_roaming_in" msgid="9045363884600341051">"Itinerancia"</string>
<string name="radioInfo_roaming_not" msgid="4849214885629672819">"Non está en itinerancia"</string>
@@ -947,8 +947,8 @@
</string-array>
<string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
- <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de emerxencia"</string>
- <string name="emergency_address_summary" msgid="3266760199681945746">"Enderezo que utilizan os servizos de emerxencia como a túa localización se fas unha chamada de emerxencia a través da wifi"</string>
+ <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de urxencia"</string>
+ <string name="emergency_address_summary" msgid="3266760199681945746">"Enderezo que utilizan os servizos de urxencia como a túa localización se fas unha chamada de urxencia a través da wifi"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
<string name="sound_settings" msgid="5534671337768745343">"Son"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1596,7 +1596,7 @@
<string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
<string name="show_running_services" msgid="5736278767975544570">"Mostrar servizos en curso"</string>
<string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos na caché"</string>
- <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emerxencia"</string>
+ <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de urxencia"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias das aplicacións"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablecer as preferencias das aplicacións?"</string>
<string name="reset_app_preferences_desc" msgid="4822447731869201512">"Con esta acción, restableceranse todas as preferencias de:\n\n "<li>"aplicacións desactivadas"</li>\n" "<li>"notificacións de aplicacións desactivadas"</li>\n" "<li>"aplicacións predeterminadas para accións"</li>\n" "<li>"restricións de datos en segundo plano para aplicacións"</li>\n" "<li>"calquera restrición de permisos"</li>\n\n" Non perderás datos de ningunha aplicación."</string>
@@ -2231,8 +2231,8 @@
<string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder usar as credenciais de almacenamento, o dispositivo debe ter unha pantalla de bloqueo segura"</string>
<string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ESTABLECER BLOQUEO"</string>
<string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
- <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de emerxencia"</string>
- <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
+ <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urxencia"</string>
+ <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de urxencia"</string>
<string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguranza"</string>
<string name="backup_section_title" msgid="7952232291452882740">"Copia de seguranza e restauración"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Datos persoais"</string>
@@ -2454,7 +2454,7 @@
<string name="data_usage_metered_yes" msgid="9217539611385225894">"De pago por consumo"</string>
<string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
<string name="data_usage_disclaimer" msgid="6887858149980673444">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
- <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emerxencia"</string>
+ <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de urxencia"</string>
<string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver á chamada"</string>
<string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
<string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
@@ -2622,7 +2622,7 @@
<string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O historial de chamadas compartirase con este usuario."</string>
<string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
<string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
- <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
+ <string name="emergency_info_title" msgid="208607506217060337">"Información de urxencia"</string>
<string name="emergency_info_summary" msgid="5062945162967838521">"Información e contactos para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
<string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
@@ -2667,7 +2667,7 @@
<string name="call_manager_title" msgid="4479949569744516457">"Xestor de chamadas"</string>
<!-- no translation found for call_manager_summary (5918261959486952674) -->
<skip />
- <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emerxencia"</string>
+ <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de urxencia"</string>
<string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
<string name="access_point_names" msgid="1381602020438634481">"Nomes dos puntos de acceso"</string>
<string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo mellorado de LTE 4G"</string>
@@ -2786,7 +2786,7 @@
<string name="keywords_users" msgid="3434190133131387942">"restrición, restrinxir, restrinxido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, correcto, son, vibrar, automático, idioma, xesto, suxerir, suxestión, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"restablecer, preferencias, predeterminadas"</string>
- <string name="keywords_emergency_app" msgid="3143078441279044780">"emerxencia, en caso de emerxencia, aplicación, predeterminada"</string>
+ <string name="keywords_emergency_app" msgid="3143078441279044780">"urxencia, en caso de urxencia, aplicación, predeterminada"</string>
<string name="keywords_default_phone_app" msgid="4213090563141778486">"teléfono, marcador, predeterminado"</string>
<string name="keywords_all_apps" msgid="7814015440655563156">"aplicacións, descarga, aplicacións, sistema"</string>
<string name="keywords_app_permissions" msgid="4229936435938011023">"aplicacións, permisos, seguranza"</string>
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Coa pantalla desactivada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Coa pantalla activada ou desactivada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduce o PIN do administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Poden modificar a configuración do sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modificar configuración"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permiso para modificar a configuración do sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar a configuración do sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6919115..7a480c5 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"લોડ કરી રહ્યું છે..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"સ્ક્રીન લૉક સેટ કરો"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"સુરક્ષા માટે, પાસવર્ડ સેટ કરો"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ફિંગરપ્રિન્ટ વાપરવા, પાસવર્ડ સેટ કરો"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ફિંગરપ્રિન્ટ વાપરવા, પૅટર્ન સેટ કરો"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"સુરક્ષા માટે, પિન સેટ કરો"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ફિંગરપ્રિન્ટનો ઉપયોગ કરવા, પિન સેટ કરો"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"સુરક્ષાના કારણસર, એક પૅટર્ન સેટ કરો"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"જ્યારે સ્ક્રીન બંધ હોય"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"જ્યારે સ્ક્રીન ચાલુ કે બંધ હોય"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"સૂચનાઓની સેટિંગ્સ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"આ ઉપકરણ વિશે પ્રતિસાદ મોકલો"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"વ્યવસ્થાપક પિન દાખલ કરો"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ચાલુ"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરી શકે છે"</string>
<string name="write_system_settings" msgid="3482913590601096763">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરો"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ઍપ્લિકેશન સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની પરવાનગી"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાને મંજૂરી આપો"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"આ પરવાનગી એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપે છે."</string>
<string name="write_settings_on" msgid="8230580416068832239">"હા"</string>
<string name="write_settings_off" msgid="5156104383386336233">"નહીં"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e82a014..60f67b6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1470,12 +1470,10 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हो रहा है..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करें"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षा के लिए, पासवर्ड सेट करें"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फ़िंगरप्रिंट इस्तेमाल के लिए पासवर्ड डालें"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फ़िंगरप्रिंट इस्तेमाल के लिए पैटर्न डालें"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षा के लिए, पिन सेट करें"</string>
- <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फ़िंगरप्रिंट के लिए पिन सेट करें"</string>
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फ़िंगरप्रिंट के बैकअप के लिए पिन सेट करें"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षा के लिए कोई पैटर्न सेट करें"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"पासवर्ड फिर से दर्ज करें"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने पैटर्न की पुष्टि करें"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन के बंद होने पर"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन के चालू या बंद होने पर"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"व्यवस्थापक पिन डालें"</string>
<string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"सिस्टम सेटिंग को बदल सकते हैं"</string>
<string name="write_system_settings" msgid="3482913590601096763">"सिस्टम सेटिंग बदलें"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ऐप को सिस्टम सेटिंग बदलने की अनुमति"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"सिस्टम सेटिंग को बदलने की अनुमति दें"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"यह अनुमति किसी ऐप को सिस्टम सेटिंग बदलने देती है."</string>
<string name="write_settings_on" msgid="8230580416068832239">"हां"</string>
<string name="write_settings_off" msgid="5156104383386336233">"नहीं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e792cb0..27995fb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3088,6 +3088,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je zaslon isključen"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je zaslon uključen ili isključen"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"S dopuštenjem za izmjenu postavki sustava"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Izmjena postavki sustava"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Dopuštenje aplikacije za izmjenu postavki sustava"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Dopusti izmjenu postavki sustava"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 74fa10f..eae7888 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -3057,6 +3057,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ha a képernyő ki van kapcsolva"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Amikor a képernyő be vagy ki van kapcsolva"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Adja meg a rendszergazdai PIN-kódot"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
@@ -3308,7 +3310,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Módosíthatja a rendszerbeállításokat"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Rendszerbeállítások módosítása"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Alkalmazásengedély rendszerbeállítások módosítására"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Rendszerbeállítások módosításának engedélyezése"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index f224b0b..55000c3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Երբ էկրանը միացված կամ անջատված է"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Կարծիք հայտնել սարքի մասին"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Մուտքագրեք ադմինիստրատորի PIN կոդը"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Միացված է"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Կարող են փոփոխել համակարգի կարգավորումները"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Փոփոխել կարգավորումները"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Թույլատրել հավելվածին փոփոխել կարգավորումները"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Թույլատրել կարգավորումների փոփոխումը"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Միացնելով այս թույլտվությունը՝ թույլ եք տալիս հավելվածին փոփոխել համակարգի կարգավորումները:"</string>
<string name="write_settings_on" msgid="8230580416068832239">"Այո"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ոչ"</string>
@@ -3423,7 +3426,7 @@
<string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ամեն ամիս, ամսի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
<string name="network_restrictions" msgid="8234695294536675380">"Ցանցային սահմանափակումներ"</string>
<plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
- <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
+ <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
</plurals>
<string name="operator_warning" msgid="1862988028996859195">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index aa28739..46a0cb4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Saat layar nonaktif"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Saat layar aktif atau nonaktif"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan notifikasi"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN admin"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Dapat mengubah setelan sistem"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Ubah setelan sistem"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Izin mengubah setelan sistem aplikasi"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Izinkan mengubah setelan sistem"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 93604f5..c5f3991 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Þegar slökkt er á skjánum"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Þegar kveikt eða slökkt er á skjánum"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Færðu inn PIN-númer kerfisstjóra"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Kveikt"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Geta breytt kerfisstillingum"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Breyta kerfisstillingum"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Heimild forrits til að breyta kerfisstillingum"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Leyfa breytingar á kerfisstillingum"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d6e1211..4126949 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando lo schermo è spento"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando lo schermo è acceso o spento"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserisci PIN amministratore"</string>
<string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Possono modificare le impostazioni di sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modifica impostazioni sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Autorizzazione modifica impostazioni sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Consenti modifica impostazioni di sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cbdb563..c17f4d0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3123,6 +3123,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"כאשר המסך כבוי"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"כאשר המסך מופעל או כבוי"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"שליחת משוב על המכשיר הזה"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"הזן את קוד הגישה של מנהל המכשיר"</string>
<string name="switch_on_text" msgid="1124106706920572386">"פועל"</string>
@@ -3388,7 +3390,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"יכולות לשנות את הגדרות המערכת"</string>
<string name="write_system_settings" msgid="3482913590601096763">"שינוי הגדרות המערכת"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"הרשאת אפליקציה לשנות את הגדרות המערכת"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"אפשר לשנות את הגדרות המערכת"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
<string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
<string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fe7ff90..c29ade0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3059,6 +3059,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"画面が OFF のとき"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"画面が ON または OFF のとき"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"管理者 PIN の入力"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ON"</string>
@@ -3310,7 +3312,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"システム設定を変更できるアプリ"</string>
<string name="write_system_settings" msgid="3482913590601096763">"システム設定の変更"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"アプリがシステム設定を変更する権限"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"システム設定の変更の許可"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"この権限により、アプリはシステム設定の変更ができるようになります。"</string>
<string name="write_settings_on" msgid="8230580416068832239">"可"</string>
<string name="write_settings_off" msgid="5156104383386336233">"不可"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 9796c6b..5ba5973 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"გამორთული ეკრანისას"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ჩართული ან გამორთული ეკრანისას"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"შეიყვანეთ ადმინისტრატორის PIN-კოდი"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ჩართული"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"შეუძლია სისტემის პარამეტრების შეცვლა"</string>
<string name="write_system_settings" msgid="3482913590601096763">"სისტემის პარამეტრების შეცვლა"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"აპის მიერ სისტემის პარამეტრების შეცვლის ნებართვა"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"მიეცით სისტემის პარამეტრების შეცვლის უფლება"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ეს ნებართვა უფლებას აძლევს აპს, შეცვალოს სისტემის პარამეტრები."</string>
<string name="write_settings_on" msgid="8230580416068832239">"კი"</string>
<string name="write_settings_off" msgid="5156104383386336233">"არა"</string>
@@ -3401,9 +3404,9 @@
<string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
<string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
<string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
- <string name="connectivity_monitor_switch" msgid="9059759348648583421">"დაკავშირებადობის მონიტორინგი"</string>
- <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"კავშირის გამართულ მუშაობასთან მიმართებით პრობლემის გამოვლენისას, დაკავშირებადობის მონიტორინგი შეაგროვებს ჟურნალების ჩანაწერებს, ხოლო მომხმარებელს დაუყოვნებლივ აცნობებს და შეცდომის შესახებ მოხსენებას შეთავაზებს"</string>
- <string name="connectivity_monitor_toast" msgid="5551859612881173028">"დაკავშირებადობის მონიტორინგთან მიმართებით ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
+ <string name="connectivity_monitor_switch" msgid="9059759348648583421">"კავშირის მონიტორინგი"</string>
+ <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"კავშირის გამართულ მუშაობასთან მიმართებით პრობლემის გამოვლენისას, კავშირის მონიტორინგი შეაგროვებს ჟურნალების ჩანაწერებს, ხოლო მომხმარებელს დაუყოვნებლივ აცნობებს და შეცდომის შესახებ მოხსენებას შეთავაზებს"</string>
+ <string name="connectivity_monitor_toast" msgid="5551859612881173028">"კავშირის მონიტორინგთან მიმართებით ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
<string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"კამერის HAL HDR+"</string>
<string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"კამერის HAL HDR+ ცვლილების მისასადაგებლად გადატვირთეთ მოწყობილობა"</string>
<string name="camera_laser_sensor_switch" msgid="8913588990743234440">"კამერის ლაზერული სენსორი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1742e4e..c61a7e6 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктелуде..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Экранды құлыптауды орнатыңыз"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Қауіпсіздік үшін құпия сөз орнатыңыз"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Саусақ ізін пайдалану үшін PIN кодын орнатыңыз"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Қауіпсіздік үшін өрнекті орнатыңыз"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өшірулі кезде"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран қосулы немесе өшірулі кезде"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Әкімші PIN кодын енгізу"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Қосулы"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Жүйелік параметрлерді өзгертуге болады"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Жүйелік параметрлерді өзгерту"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Қолданбаның жүйелік параметрлерді өзгерту рұқсаты"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Жүйелік параметрлерді өзгертуге рұқсат ету"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Иә"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Жоқ"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index d3470c6..bc9cf31 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"នៅពេលអេក្រង់បិទ"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"នៅពេលអេក្រង់បើក ឬបិទ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"កំណត់ការជូនដំណឹង"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់មតិស្ថាបនាអំពីឧបករណ៍នេះ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"បញ្ចូលកូដ PIN របស់អ្នកគ្រប់គ្រង"</string>
<string name="switch_on_text" msgid="1124106706920572386">"បើក"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"អាចកែការកំណត់ប្រព័ន្ធ"</string>
<string name="write_system_settings" msgid="3482913590601096763">"កែការកំណត់ប្រព័ន្ធ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"សិទ្ធិអនុញ្ញាតកម្មវិធីកែការកំណត់ប្រព័ន្ធ"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"អនុញ្ញាតកែការកំណត់ប្រព័ន្ធ"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"សិទ្ធិអនុញ្ញាតនេះអនុញ្ញាតឲ្យកម្មវិធីកែការកំណត់ប្រព័ន្ធ។"</string>
<string name="write_settings_on" msgid="8230580416068832239">"បាទ/ចាស"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ទេ"</string>
@@ -3401,9 +3404,9 @@
<string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
<string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
<string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
- <string name="connectivity_monitor_switch" msgid="9059759348648583421">"អង្គពិនិត្យស្ថានភាពតភ្ជាប់"</string>
- <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor នឹងប្រមូលកំណត់ហេតុ នៅពេលវារកឃើញបញ្ហាក្នុងការភ្ជាប់ និងបញ្ជូនការជូនដំណឹងទៅកាន់អ្នកប្រើប្រាស់ដើម្បីរាយការណ៍ពីបញ្ហា"</string>
- <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ដើម្បីអនុវត្តការផ្លាស់ប្តូរលើអង្គពិនិត្យស្ថានភាពតភ្ជាប់ សូមចាប់ផ្តើមឧបករណ៍ឡើងវិញ"</string>
+ <string name="connectivity_monitor_switch" msgid="9059759348648583421">"កម្មវិធីតាមដានការភ្ជាប់"</string>
+ <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"កម្មវិធីតាមដានការភ្ជាប់ នឹងប្រមូលកំណត់ហេតុ នៅពេលវារកឃើញបញ្ហាក្នុងការភ្ជាប់ និងបញ្ជូនការជូនដំណឹងទៅកាន់អ្នកប្រើប្រាស់ដើម្បីរាយការណ៍ពីបញ្ហា"</string>
+ <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ដើម្បីអនុវត្តការផ្លាស់ប្តូរលើកម្មវិធីតាមដានការភ្ជាប់ សូមចាប់ផ្តើមឧបករណ៍ឡើងវិញ"</string>
<string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"កាមេរ៉ា HAL HDR+"</string>
<string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ដើម្បីអនុវត្តការផ្លាស់ប្តូរលើកាមេរ៉ា HAL HDR+ សូមចាប់ផ្តើមឧបករណ៍ឡើងវិញ"</string>
<string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ឧបករណ៍ចាប់សញ្ញារបស់កាមេរ៉ាដែលការពារពន្លឺឡាស៊ែរ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 520ccb1..43117bc 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಾಸ್ವರ್ಡ್ ಹೊಂದಿಸಿ"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ಫಿಂಗರ್ ಫ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್ವರ್ಡ್ ಹೊಂದಿಸಿ"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ಫಿಂಗರ್ ಫ್ರಿಂಟ್ ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ಫಿಂಗರ್ ಫ್ರಿಂಟ್ ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪ್ಯಾಟ್ರನ್ ಹೊಂದಿಸಿ"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ಪರದೆ ಆನ್ ಅಥವಾ ಆಫ್ ಆಗಿರುವಾಗ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ನಿರ್ವಾಹಕರ ಪಿನ್ ನಮೂದಿಸಿ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ಆನ್"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಬಹುದು"</string>
<string name="write_system_settings" msgid="3482913590601096763">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ಅಪ್ಲಿಕೇಶನ್ ಮಾರ್ಪಡಿಸಲು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅನುಮತಿ"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳ ಮಾರ್ಪಡಿಸುವಿಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="write_settings_on" msgid="8230580416068832239">"ಹೌದು"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ಇಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2ba7e71..3fff77c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"화면이 꺼져 있을 때"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"화면이 켜져 있든 꺼져 있든 항상"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"관리자 PIN 입력"</string>
<string name="switch_on_text" msgid="1124106706920572386">"사용"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"시스템 설정 수정 가능"</string>
<string name="write_system_settings" msgid="3482913590601096763">"시스템 설정 수정"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"앱의 시스템 설정 수정 권한"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"시스템 설정 수정 허용"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"이 권한은 앱이 시스템 설정을 수정하도록 허용합니다."</string>
<string name="write_settings_on" msgid="8230580416068832239">"예"</string>
<string name="write_settings_off" msgid="5156104383386336233">"아니요"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3e6649a..b5b87d8 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -3058,6 +3058,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өчүп турганда"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран күйүп же өчүп турганда"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Администратордун PIN кодун киргизиңиз"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Күйүк"</string>
@@ -3309,7 +3311,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Тутум жөндөөлөрүн өзгөртө алат"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Тутум жөндөөлөрүн өзгөртүү"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Колдонмонун тутум жөндөөлөрүн өзгөртүү уруксаты"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Тутум жөндөөлөрүн өзгөртүүгө уруксат"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ооба"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Жок"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 412581e..738d657 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ເມື່ອໜ້າຈໍປິດຢູ່"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ເມື່ອໜ້າຈໍເປີດ ຫຼື ປິດຢູ່"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ສົ່ງຄຳຕິຊົມກ່ຽວກັບອຸປະກອນນີ້"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ໃສ່ລະຫັດ PIN ຜູ້ເບິ່ງແຍງລະບົບ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ເປີດ"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"ສາມາດແກ້ໄຂການຕັ້ງຄ່າລະບົບໄດ້"</string>
<string name="write_system_settings" msgid="3482913590601096763">"ແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ການອະນຸຍາດແອັບແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"ອະນຸຍາດແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ການອະນຸຍາດນີ້ອະນຸຍາດໃຫ້ແອັບດັດແປງການຕັ້ງຄ່າລະບົບໄດ້."</string>
<string name="write_settings_on" msgid="8230580416068832239">"ແມ່ນແລ້ວ"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ບໍ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 10f3e96..f113c52 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kai ekranas išjungtas"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kai ekranas įjungtas arba išjungtas"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Įveskite administratoriaus PIN kodą"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Įjungta"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Gali keisti sistemos nustatymus"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Keisti sistemos nustatymus"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Programos leidimas keisti sistemos nustatymus"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Leisti keisti sistemos nustatymus"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
@@ -3487,8 +3490,8 @@
<string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
<string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
<string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
- <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Ryšio stebėjimo priemonė"</string>
- <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ryšio stebėjimo priemonė rinks žurnalus, kai aptiks ryšio problemą, ir naudotojui pateiks raginimą pranešti apie riktą"</string>
+ <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+ <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"„ConnectivityMonitor“ rinks žurnalus, kai aptiks ryšio problemą, ir naudotojui pateiks raginimą pranešti apie riktą"</string>
<string name="connectivity_monitor_toast" msgid="5551859612881173028">"Kad pritaikytumėte ryšio stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
<string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparatas HAL HDR+"</string>
<string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kad pritaikytumėte fotoaparato HAL HDR+ pakeitimą, paleiskite įrenginį iš naujo"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 722769c..e8aee6c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3088,6 +3088,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kad ekrāns ir izslēgts"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kad ekrāns ir ieslēgts vai izslēgts"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ievadiet administratora PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Ieslēgts"</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Var pārveidot sistēmas iestatījumus"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Iestatījumu pārveidošana"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Atļauja lietotnei pārveidot sistēmas iestatījumus"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Atļaut pārveidot sistēmas iestatījumus"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
diff --git a/res/values-mcc262-mnc02-gl/strings.xml b/res/values-mcc262-mnc02-gl/strings.xml
index 2c70218..d67c86f 100644
--- a/res/values-mcc262-mnc02-gl/strings.xml
+++ b/res/values-mcc262-mnc02-gl/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de emerxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de emerxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de emerxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de urxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de urxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de urxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 81cc00a..8a9ead4 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Кога екранот е исклучен"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Кога екранот е вклучен или исклучен"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Внесете PIN на админстратор"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Вклучено"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Може да ги менува поставките на системот"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Менување поставки на системот"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Дозвола на апликација за менување поставки на систем"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Дозволи менување на поставките на системот"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Оваа дозвола овозможува апликацијата да менува поставки на системот."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index efa3a6a..593946a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ലോഡുചെയ്യുന്നു..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ഒരു സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"സുരക്ഷയ്ക്കായി, ഒരു പാസ്വേഡ് സജ്ജമാക്കുക"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"വിരലടയാളത്തിന്, പാസ്വേഡ് സജ്ജമാക്കൂ"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"വിരലടയാളത്തിന്, പാറ്റേൺ സജ്ജമാക്കൂ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"സുരക്ഷയ്ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജീകരിക്കുക"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"സുരക്ഷയ്ക്കായി, ഒരു പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"സ്ക്രീൻ ഓഫായിരിയ്ക്കുമ്പോൾ"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"സ്ക്രീൻ ഓണോ ഓഫോ ആയിരിക്കുമ്പോൾ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ഇതേക്കുറിച്ചുള്ള ഫീഡ്ബാക്ക് അയയ്ക്കൂ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"അഡ്മിൻ പിൻ നൽകുക"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ഓണാക്കുക"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കാൻ കഴിയും"</string>
<string name="write_system_settings" msgid="3482913590601096763">"സിസ്റ്റം ക്രമീകരണങ്ങൾ പരിഷ്ക്കരിക്കുക"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"സിസ്റ്റം ക്രമീകരണ അനുമതിയെ ആപ്പ് പരിഷ്കരിക്കുന്നു"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കുന്നത് അനുവദിക്കുക"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കുന്നതിന് ഒരു ആപ്പിനെ ഈ അനുമതി അനുവദിക്കുന്നു."</string>
<string name="write_settings_on" msgid="8230580416068832239">"അതെ"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ഇല്ല"</string>
@@ -3405,7 +3406,7 @@
<string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
<string name="connectivity_monitor_switch" msgid="9059759348648583421">"കണക്റ്റിവിറ്റി മോണിറ്റർ"</string>
<string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"കണക്റ്റിവിറ്റി മോണിറ്റർ, ഒരു പ്രശ്നം കണ്ടെത്തുമ്പോൾ അതിന്റെ ലോഗുകൾ ശേഖരിക്കുകയും ബഗ് ഫയൽ ചെയ്യാൻ ഉപയോക്താവിന് അറിയിയിപ്പ് നൽകുകയും ചെയ്യും"</string>
- <string name="connectivity_monitor_toast" msgid="5551859612881173028">"കണക്റ്റിവിറ്റി മോണിറ്ററിലെ മാറ്റം പ്രയോഗിക്കാൻ ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
+ <string name="connectivity_monitor_toast" msgid="5551859612881173028">"കണക്റ്റിവിറ്റി മോണിറ്ററിലെ മാറ്റം പ്രാവര്ത്തികമാക്കാൻ ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
<string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ക്യാമറ HAL HDR+"</string>
<string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ക്യാമറ HAL HDR+ മാറ്റം പ്രയോഗിക്കാൻ, ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
<string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ക്യാമറ ലേസർ സെൻസർ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 3b6ec2f..4152905 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -3053,6 +3053,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Дэлгэц унтарсан үед"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Дэлгэц асаалттай буюу унтраалттай үед"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Админы ПИН-г оруулах"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Идэвхтэй"</string>
@@ -3304,7 +3306,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Системийн тохиргоо өөрчилж болно"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Системийн тохиргоог өөрчлөх"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Апп-ын системийн тохиргоо өөрчлөх зөвшөөрөл"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Системийн тохиргоо өөрчлөхийг зөвшөөрөх"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Энэ нь апп-д системийн тохиргоог өөрчлөхийг зөвшөөрдөг."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Тийм"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Үгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 25c80a0..78a8643 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड करत आहे..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करा"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षिततेसाठी पासवर्ड सेट करा."</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फिंगरप्रिंट वापरासाठी, पासवर्ड सेट करा"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फिंगरप्रिंट वापरासाठी, पॅटर्न सेट करा"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षिततेसाठी पिन सेट करा"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फिंगरप्रिंट वापरण्यासाठी, पिन सेट करा"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षिततेसाठी, एक पॅटर्न सेट करा"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन बंद असताना"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन चालू किंवा बंद असताना"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासक पिन एंटर करा"</string>
<string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"सिस्टीम सेटिंग्ज सुधारित करू शकतात"</string>
<string name="write_system_settings" msgid="3482913590601096763">"सिस्टम सेटिंग्ज सुधारित करा"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"अॅप सिस्टीम सेटिंग्ज परवानगी सुधारित करतो"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"सिस्टीम सेटिंग्ज सुधारित करण्याची अनुमती द्या"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टम सेटिंग्ज सुधारित करण्याची अनुमती देते."</string>
<string name="write_settings_on" msgid="8230580416068832239">"होय"</string>
<string name="write_settings_off" msgid="5156104383386336233">"नाही"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index bb9e419..d249a7b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuatkan..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Tetapkan kunci skrin"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Sebagai langkah keselamatan, tetapkan kata laluan"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Utk mnggnakan cap jari, ttpkn kta laluan"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Utk menggunakan cap jari, tetapkan corak"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Sebagai langkah keselamatan, tetapkan PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Untuk menggunakan cap jari, tetapkan PIN"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Sebagai langkah keselamatan, tetapkan corak"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Apabila skrin dimatikan"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Apabila skrin dihidupkan atau dimatikan"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN pentadbir"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Dihidupkan"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Boleh mengubah suai tetapan sistem"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Ubah suai tetapan sistem"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Kebenaran apl mengubah suai tetapan sistem"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Benarkan pengubahsuaian tetapan sistem"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 5b8ea1f..b57846c 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"မျက်နှာပြင် ပိတ်ထားစဉ်"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"မျက်နှာပြင်ကို ဖွင့်ထားစဉ် သို့မဟုတ် ပိတ်ထားစဉ်"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"စီမံခန့်ခွဲသူ၏ ပင်နံပါတ်ကို ထည့်ပါ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ဖွင့်ရန်"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်နိုင်သည်"</string>
<string name="write_system_settings" msgid="3482913590601096763">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"စနစ်ချိန်ညှိချက်များပြန်ပြင်ခြင်း အပ်ဖ်ခွင့်ပြုချက်"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်ရန် ခွင့်ပြုမည်"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ဤခွင့်ပြုချက်သည် အပ်ဖ်ကို စနစ်ချိန်ညှိချက်များအား ပြန်ပြင်ခွင့်ပေးသည်။"</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
<string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a48df4b..bbb8c4b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skjermen er av"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skjermen er på eller av"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Skriv inn PIN-koden for administrator"</string>
<string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Kan endre systeminnstillingene"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Endre systeminnstillingene"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Apptillatelse til å endre systeminnstillingene"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Tillat endring av systeminnstillingene"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 130e98e..0f9b096 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हुँदै..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"एउटा स्क्रिन लक सेट गर्नुहोस्"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षाका लागि एउटा पासवर्ड सेट गर्नुहोस्"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नु…"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नु…"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षाका लागि एउटा PIN सेट गर्नुहोस्"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षाका लागि कुनै ढाँचा सेट गर्नुहोस्"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रिन अफ हुँदा"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रिन अन वा अफ हुँदा"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासकको PIN प्रविष्ट गर्नुहोस्"</string>
<string name="switch_on_text" msgid="1124106706920572386">"सक्रिय गर्नुहोस्"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"प्रणाली सेटिङहरू परिमार्जन गर्न सक्ने"</string>
<string name="write_system_settings" msgid="3482913590601096763">"प्रणाली सेटिङहरू परिमार्जन गर्नुहोस्"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"अनुप्रयोगद्वारा प्रणाली सेटिङहरू अनुमति परिवर्तन"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"प्रणाली सेटिङहरू परिमार्जन गर्न अनुमति"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"यस अनुमतिले अनुप्रयोगलाई प्रणाली सेटिङहरू परिमार्जन गर्न दिन्छ।"</string>
<string name="write_settings_on" msgid="8230580416068832239">"हो"</string>
<string name="write_settings_off" msgid="5156104383386336233">"होइन"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f4962df..56da29a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Als scherm uit is"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Als scherm aan of uit is"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Beheerderspincode invoeren"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Kan systeeminstellingen aanpassen"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Systeeminstellingen aanpassen"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"App-machtigingen voor aanpassen van systeeminstellingen"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Aanpassen van systeeminstellingen toestaan"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 225dade..d2db304 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ਕੋਈ ਸਕ੍ਰੀਨ ਲਾਕ ਸਥਾਪਤ ਕਰੋ"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸਥਾਪਤ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਵੇ"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਚਾਲੂ ਜਾਂ ਬੰਦ ਹੋਵੇ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ਇਸ ਡੀਵਾਈਸ ਬਾਰੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ਪ੍ਰਸ਼ਾਸਕ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ਚਾਲੂ"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
<string name="write_system_settings" msgid="3482913590601096763">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਇਜਾਜ਼ਤ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
<string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 126c192..685a225 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Gdy ekran jest wyłączony"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Gdy ekran jest włączony lub wyłączony"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Wpisz kod PIN administratora"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Wł."</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Mogą modyfikować ustawienia systemu"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modyfikowanie ustawień systemu"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Uprawnienie aplikacji do modyfikowania ust. systemu"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Zezwól na modyfikowanie ustawień systemu"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 56ab7cd..0b5c640 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificação de config. do sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b758374..3532621 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1473,7 +1473,7 @@
<string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Definir alternativa à impressão digital"</string>
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Definir alternativa à impressão digital"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de segurança, defina um PIN."</string>
- <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Definir alternativa à impressão digital"</string>
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para a impressão digital, defina um PIN"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por motivos de segurança, defina um padrão."</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduzir a palavra-passe"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando o ecrã está desligado"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando o ecrã está ligado ou desligado"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduzir o PIN do administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Podem modificar as definições do sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modificar definições sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Autorização da aplicação para mod. def. do sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar as definições do sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 56ab7cd..0b5c640 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificação de config. do sistema"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 617fea2..2f1c81c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3088,6 +3088,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Când ecranul este dezactivat"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Când ecranul este activat sau dezactivat"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduceți codul PIN de administrator"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Pot modifica setările de sistem"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modifică setările de sistem"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Permisiune aplicație modificare setări de sistem"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Permiteți modificarea setărilor de sistem"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 08e01ea..3f9e945 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При отключенном экране"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включенном и отключенном экране"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Введите PIN-код администратора"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ВКЛЮЧЕНО"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Могут изменять системные настройки"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Изменить системные настройки"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Разрешение на изменение системных настроек"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Разрешить изменять системные настройки"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Приложение сможет изменять системные настройки."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Нет"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5c63c47..17fd567 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"තිරය ක්රියාවිරහිත විට"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"තිරය ක්රියාත්මක හෝ ක්රියාවිරහිත විට"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්රතිපෝෂණ යවන්න"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"පරිපාලක PIN එක ඇතුල් කරන්න"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ක්රියාත්මකයි"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"පද්ධති සැකසීම් විකරණය කළ හැකිය"</string>
<string name="write_system_settings" msgid="3482913590601096763">"පද්ධති සැකසීම් විකරණය කරන්න"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"යෙදුම් පද්ධති සැකසීම් විකරණය කිරීමේ අවසරය"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"පද්ධති සැකසීම් විකරණය කිරීමට ඉඩ දෙන්න"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"මෙම අවසරය යෙදුමකට පද්ධති සැකසීම් විකරණය කිරීමට ඉඩ දෙයි."</string>
<string name="write_settings_on" msgid="8230580416068832239">"ඔව්"</string>
<string name="write_settings_off" msgid="5156104383386336233">"නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 82a4ec1..4a4c6ef 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Spätná väzba o zariadení"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadajte PIN správcu"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Môže upravovať nastavenia systému"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Úprava nastavení systému"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Povolenie pre aplikáciu na úpravy nastavení systému"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Povoliť úpravy nastavení systému"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cc16526..a47126b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ko je zaslon izklopljen"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ko je zaslon vklopljen ali izklopljen"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Vnos skrbniške kode PIN"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Vklopljeno"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Lahko spreminjajo sistemske nastavitve"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Spreminjanje sist. nastavitev"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Dovoljenje aplikacijam za sprem. sistem. nastavitev"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Dovoli spreminjanje sistemskih nastavitev"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1c3be4e..e170871 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Po ngarkon..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Cakto një kyçje të ekranit"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Për siguri, cakto një fjalëkalim"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Cakto një rezervë për gjurmën e gishtit"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Cakto një rezervë për gjurmën e gishtit"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Për siguri, cakto një kod PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Cakto një rezervë për gjurmën e gishtit"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Për siguri, cakto një motiv"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kur ekrani është joaktiv"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kur ekrani është aktiv ose joaktiv"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Cilësimet e njoftimeve"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Dërgo përshtypjet për këtë pajisje"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Fut kodin PIN të administratorit"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Aktivizuar"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Mund të modifikojë cilësimet e sistemit"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Modifiko cilësimet e sistemit"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Leje për aplikacionin që të modifikojë cilësimet e sistemit"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Lejo modifikimin e cilësimeve të sistemit"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 52215e1..91b05e2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2015,8 +2015,8 @@
<!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
<skip />
<string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
- <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
- <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
+ <string name="wifi_on_time" msgid="3208518458663637035">"Време од укључивања Wi-Fi мреже"</string>
+ <string name="bluetooth_on_time" msgid="3056108148042308690">"Време од укључивања Wi-Fi мреже"</string>
<string name="advanced_battery_title" msgid="2068039111517508622">"Напредна потрошња батерије"</string>
<string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
<string name="battery_details_title" msgid="6101394441569858580">"Потрошња батерије"</string>
@@ -3088,6 +3088,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Када је екран искључен"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Када је екран укључен или искључен"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Унесите PIN администратора"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Укључено"</string>
@@ -3346,7 +3348,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Могу да мењају подешавања система"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Мењање подешавања система"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Дозвола за мењање подешавања система за апликацију"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Дозволи мењање подешавања система"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Ова дозвола дозвољава апликацији да мења подешавања система."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fba599f..6187ff5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"När skärmen är avstängd"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"När skärmen är påslagen eller avstängd"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ange administratörens pinkod:"</string>
<string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Kan ändra systeminställningar"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Ändra systeminställningar"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Behörighet för app att ändra systeminställningar"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Tillåt att appen ändrar systeminställningar"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 77782e5..930acd9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wakati skrini imezimwa"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wakati skrini imezimwa au imewashwa"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Weka PIN ya msimamizi"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Inaweza kubadilisha mipangilio ya mfumo"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Badilisha mipangilio ya mfumo"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Ruhusa ya programu ya kubadilisha mipangilio ya mfumo"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Ruhusu ubadilishaji wa mipangilio ya mfumo"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index ceee70d..d65507b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ஏற்றுகிறது..."</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"திரைப் பூட்டை அமைக்கவும்"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"பாதுகாப்பிற்கு, கடவுச்சொல்லை அமைக்கவும்"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"கைரேகையைப் பயன்படுத்த, கடவுச்சொல்லை அமை"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"கைரேகையைப் பயன்படுத்த, வடிவத்தை அமை"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"கைரேகையைப் பயன்படுத்த, பின்னை அமைக்கவும்"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"பாதுகாப்பிற்காக, பேட்டர்னை அமைக்கவும்"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"திரை முடக்கப்பட்டிருக்கும் போது"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"திரை இயக்கத்தில் அல்லது முடக்கத்தில் உள்ள போது"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"நிர்வாகிப் பின்னை உள்ளிடவும்"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ஆன்"</string>
@@ -3308,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
<string name="write_system_settings" msgid="3482913590601096763">"சாதன அமைப்புகளை மாற்று"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"பயன்பாடானது முறைமை அமைப்புகளை மாற்றுவதற்கான அனுமதி"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"முறைமை அமைப்புகளை மாற்ற அனுமதி"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"இது முறைமை அமைப்புகளை மாற்ற, பயன்பாட்டை அனுமதிக்கும்."</string>
<string name="write_settings_on" msgid="8230580416068832239">"அனுமதிக்கப்பட்டது"</string>
<string name="write_settings_off" msgid="5156104383386336233">"அனுமதிக்கப்படவில்லை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 8cd36b4..944a5c0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"లోడ్ చేస్తోంది…"</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"స్క్రీన్ లాక్ను సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"భద్రత కోసం, పాస్వర్డ్ను సెట్ చేయండి"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"వేలిముద్రను ఉపయోగించడానికి, పాస్వర్డ్ను సెట్ చేయండి"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"వేలిముద్రను ఉపయోగించడానికి, ఆకృతి సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"భద్రత కోసం, పిన్ను సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"వేలిముద్రను ఉపయోగించడానికి, PINగా సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"భద్రత కోసం, నమూనాను సెట్ చేయండి"</string>
@@ -3057,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"స్క్రీన్ ఆఫ్లో ఉన్నప్పుడు"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"స్క్రీన్ ఆన్ లేదా ఆఫ్లో ఉన్నప్పుడు"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్లు"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"నిర్వాహకుల పిన్ని నమోదు చేయండి"</string>
<string name="switch_on_text" msgid="1124106706920572386">"ఆన్లో ఉంది"</string>
@@ -3309,7 +3309,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"సిస్టమ్ సెట్టింగ్లు సవరించగలవు"</string>
<string name="write_system_settings" msgid="3482913590601096763">"సిస్టమ్ సెట్టింగ్ల సవరణ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"యాప్ సిస్టమ్ సెట్టింగ్లను సవరించడానికి అనుమతి"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"సిస్టమ్ సెట్టింగ్ల సవరణకు అనుమతించు"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="write_settings_on" msgid="8230580416068832239">"అవును"</string>
<string name="write_settings_off" msgid="5156104383386336233">"లేదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 918c871..540482f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"เมื่อหน้าจอปิดอยู่"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"เมื่อหน้าจอเปิดหรือปิดอยู่"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ป้อน PIN ผู้ดูแลระบบ"</string>
<string name="switch_on_text" msgid="1124106706920572386">"เปิด"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"สามารถแก้ไขการตั้งค่าระบบได้"</string>
<string name="write_system_settings" msgid="3482913590601096763">"แก้ไขการตั้งค่าระบบ"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"สิทธิ์ของแอปในการแก้ไขการตั้งค่าระบบ"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"อนุญาตให้แก้ไขการตั้งค่าระบบ"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"สิทธิ์นี้อนุญาตให้แอปแก้ไขการตั้งค่าระบบได้"</string>
<string name="write_settings_on" msgid="8230580416068832239">"ใช่"</string>
<string name="write_settings_off" msgid="5156104383386336233">"ไม่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1e5a85b..0c1d160 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kapag naka-off ang screen"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kapag naka-on o naka-off ang screen"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Feedback tungkol sa device"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ilagay ang PIN ng admin"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Maaaring magbago ng mga setting ng system"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Baguhin ang setting ng system"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Pahintulot sa pagbago ng app sa setting ng system"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Payagan ang pagbago sa mga setting ng system"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ecc76bc..1793a79 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran kapalıyken"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran kapalıyken veya açıkken"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Yönetici PIN\'ini girin"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını değiştirebilir"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarını değiştir"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Uygulamanın, sistem ayarlarını değiştirme izni"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Sistem ayarlarını değiştirmeye izin ver"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0646670..32a9fc8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -3121,6 +3121,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Коли екран вимкнено"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Коли екран увімкнено або вимкнено"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Введіть PIN-код адміністратора"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Увімкнено"</string>
@@ -3386,7 +3388,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Може змінювати налаштування системи"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Змінювати налаштування системи"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Дозвіл змінювати налаштування системи"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Дозволити змінювати налаштування системи"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Додаток зможе змінювати налаштування системи."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Ні"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index eb6613c..bfe244f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1470,10 +1470,8 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"لوڈ ہو رہا ہے…"</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"اسکرین لاک سیٹ کریں"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"سیکیورٹی کیلئے پاسورڈ سیٹ کریں"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_fingerprint (2541818487015343503) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_fingerprint (7709785406243556723) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"فنگر پرنٹ کے لئے پاس ورڈ سیٹ کریں"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"فنگر پرنٹ کے لئے پیٹرن سیٹ کریں"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"سیکیورٹی کیلئے PIN سیٹ کریں"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"سیکیورٹی کیلئے پیٹرن سیٹ کریں"</string>
@@ -3055,6 +3053,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"جب اسکرین آف ہو"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"جب اسکرین آن یا آف ہو"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"منتظم PIN درج کریں"</string>
<string name="switch_on_text" msgid="1124106706920572386">"آن"</string>
@@ -3306,7 +3306,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"سسٹم ترتیبات میں ترمیم کر سکتی ہیں"</string>
<string name="write_system_settings" msgid="3482913590601096763">"سسٹم ترتیبات میں ترمیم کریں"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"ایپ \'سسٹم ترتیبات میں ترمیم کریں\' کی اجازت"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"\'سسٹم ترتیبات میں ترمیم کریں\' کی اجازت دیں"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"یہ اجازت ایپ کو سسٹم ترتیبات میں ترمیم کرنے دیتی ہے۔"</string>
<string name="write_settings_on" msgid="8230580416068832239">"ہاں"</string>
<string name="write_settings_off" msgid="5156104383386336233">"نہیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f6682b0..3b104fa 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -3067,6 +3067,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Agar ekran o‘chiq bo‘lsa"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Agar ekran yoniq yoki o‘chiq bo‘lsa"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator PIN kodini kiriting"</string>
<string name="switch_on_text" msgid="1124106706920572386">"YONIQ"</string>
@@ -3232,7 +3234,7 @@
<string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi mumkin."</string>
<string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi va bu vaqtincha qurilmangizni sekinlashtirishi ham mumkin."</string>
<string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ushbu xatoliklar hisoboti administratoringiz tomonidan yuborilmoqda. Batafsil ma’lumot olish uchun administratoringiz bilan bog‘laning."</string>
- <string name="share_remote_bugreport_action" msgid="532226159318779397">"Baham ko‘rish"</string>
+ <string name="share_remote_bugreport_action" msgid="532226159318779397">"Ulashish"</string>
<string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rad etish"</string>
<string name="usb_use_charging_only" msgid="2180443097365214467">"Shu qurilmani quvvatlash"</string>
<string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Faqat shu qurilmani quvvatlash"</string>
@@ -3318,7 +3320,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Tizim sozlamalarini o‘zgartirishi mumkin"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Tizim sozlamalarini o‘zgartirish"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Tizim sozlamalarini o‘zgartirish uchun ruxsat"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Tizim sozlamalarini o‘zgartirishga ruxsat"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5a39693..7cfe93f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Khi màn hình đang tắt"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Khi màn hình đang bật hoặc tắt"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Nhập mã PIN quản trị"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Bật"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Có thể sửa đổi cài đặt hệ thống"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Sửa đổi cài đặt hệ thống"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Quyền sửa đổi cài đặt hệ thống của ứng dụng"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Cho phép sửa đổi cài đặt hệ thống"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3bd56c0..0b22ac3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3055,6 +3055,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"屏幕关闭时"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"屏幕开启或关闭时"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"输入管理员 PIN 码"</string>
<string name="switch_on_text" msgid="1124106706920572386">"开启"</string>
@@ -3306,7 +3308,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"可修改系统设置"</string>
<string name="write_system_settings" msgid="3482913590601096763">"修改系统设置"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"允许应用修改系统设置权限"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"允许修改系统设置"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"此权限允许应用修改系统设置。"</string>
<string name="write_settings_on" msgid="8230580416068832239">"允许"</string>
<string name="write_settings_off" msgid="5156104383386336233">"不允许"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 95080ae..30862de 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1472,7 +1472,7 @@
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"設定螢幕鎖定"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"為安全起見，請設定密碼"</string>
<string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"如要使用指紋，請設定密碼"</string>
- <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"如要使用指紋，請設定解鎖圖案"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"如要使用指紋，請設定上鎖圖案"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為安全起見，請設定 PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"如要使用指紋，請設定 PIN"</string>
<string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"為安全起見，請設定上鎖圖案"</string>
@@ -2361,7 +2361,7 @@
<string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
<string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 錯誤"</string>
<string name="checking_decryption" msgid="8287458611802609493">"正在檢查…"</string>
- <string name="starting_android" msgid="4001324195902252681">"正在啟動 Andriod…"</string>
+ <string name="starting_android" msgid="4001324195902252681">"正在啟動 Android…"</string>
<string name="delete" msgid="4219243412325163003">"刪除"</string>
<string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
<string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -3058,6 +3058,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"輸入管理員 PIN 碼"</string>
<string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
@@ -3309,7 +3311,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"可以修改系統設定"</string>
<string name="write_system_settings" msgid="3482913590601096763">"修改系統設定"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"應用程式修改系統設定權限"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"允許修改系統設定"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"此權限允許應用程式修改系統設定。"</string>
<string name="write_settings_on" msgid="8230580416068832239">"允許"</string>
<string name="write_settings_off" msgid="5156104383386336233">"不允許"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 163a6d2..786bfd3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3059,6 +3059,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"傳送你對這個裝置的意見回饋"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"輸入管理員 PIN 碼"</string>
<string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
@@ -3310,7 +3312,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"可以修改系統設定"</string>
<string name="write_system_settings" msgid="3482913590601096763">"修改系統設定"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"應用程式修改系統設定權限"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"允許修改系統設定"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"這項權限允許應用程式修改系統設定。"</string>
<string name="write_settings_on" msgid="8230580416068832239">"可"</string>
<string name="write_settings_off" msgid="5156104383386336233">"否"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 11f1a96..9345904 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -3056,6 +3056,8 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Uma isikrini sivaliwe"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Uma isikrini sivuliwe noma sivaliwe"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
+ <!-- no translation found for suggestion_button_text (3275010948381252006) -->
+ <skip />
<string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Faka iphinikhodi yomlawuli"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Vuliwe"</string>
@@ -3307,7 +3309,8 @@
<string name="write_settings_title" msgid="4232152481902542284">"Ingashintsha izilungiselelo zesistimu"</string>
<string name="write_system_settings" msgid="3482913590601096763">"Shintsha izilungiselelo zesistimu"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"Imvume yezilungiselelo zesistimu zokushintsha zohlelo lokusebenza"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"Vumela ukushintsha izilungiselelo zesistimu"</string>
+ <!-- no translation found for permit_write_settings (658555006453212691) -->
+ <skip />
<string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
<string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
<string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce0370e..42e553d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2251,9 +2251,6 @@
<string name="summary_placeholder" translatable="false"> </string>
<!-- DO NOT TRANSLATE Summary placeholder reserving 2 lines -->
<string name="summary_two_lines_placeholder" translatable="false"> \n </string>
-
- <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
- <string name="summary_empty" translatable="false"></string>
<!-- Sound settings screen, volume title -->
<string name="all_volume_title">Volumes</string>
<!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
@@ -7317,6 +7314,8 @@
settings button -->
<string name="notification_app_settings_button">Notification settings</string>
+ <!-- Generic label for suggestion card's ok button [CHAR LIMIT=20] -->
+ <string name="suggestion_button_text">Ok</string>
<!-- [CHAR LIMIT=35] Feedback on the device -->
<string name="device_feedback">Send feedback about this device</string>
@@ -7992,7 +7991,7 @@
<!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
<string name="write_settings_preference">App modify system settings permission</string>
<!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
- <string name="permit_write_settings">Allow modify system settings</string>
+ <string name="permit_write_settings">Allow modifying system settings</string>
<!-- Description of the write system settings [CHAR LIMIT=NONE] -->
<string name="write_settings_description">This permission allows an app to modify system settings.</string>
<!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fe92e6d..c9ef22c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -318,7 +318,10 @@
<style name="TextAppearance.SuggestionTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:fontFamily">sans-serif-medium</item>
- <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.FingerprintErrorText"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 6eaede9..f0db8e7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -35,11 +35,6 @@
android:fragment="com.android.settings.DeviceAdminSettings" />
<Preference
- android:key="zen_access"
- android:title="@string/manage_zen_access_title"
- android:fragment="com.android.settings.notification.ZenAccessSettings" />
-
- <Preference
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -50,14 +45,9 @@
</Preference>
<Preference
- android:key="enabled_vr_listeners"
- android:title="@string/vr_listeners_title"
- android:fragment="com.android.settings.applications.VrListenerSettings"
- settings:keywords="@string/keywords_vr_listener">
- <extra
- android:name="classname"
- android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
- </Preference>
+ android:key="zen_access"
+ android:title="@string/manage_zen_access_title"
+ android:fragment="com.android.settings.notification.ZenAccessSettings" />
<Preference
android:key="write_settings_apps"
@@ -91,6 +81,16 @@
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
<Preference
+ android:key="manage_external_sources"
+ android:title="@string/install_other_apps"
+ android:fragment="com.android.settings.applications.ManageApplications"
+ settings:keywords="@string/keywords_install_other_apps">
+ <extra
+ android:name="classname"
+ android:value="com.android.settings.Settings$ManageExternalSourcesActivity" />
+ </Preference>
+
+ <Preference
android:key="usage_access"
android:title="@string/usage_access"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -101,13 +101,13 @@
</Preference>
<Preference
- android:key="manage_external_sources"
- android:title="@string/install_other_apps"
- android:fragment="com.android.settings.applications.ManageApplications"
- settings:keywords="@string/keywords_install_other_apps">
+ android:key="enabled_vr_listeners"
+ android:title="@string/vr_listeners_title"
+ android:fragment="com.android.settings.applications.VrListenerSettings"
+ settings:keywords="@string/keywords_vr_listener">
<extra
android:name="classname"
- android:value="com.android.settings.Settings$ManageExternalSourcesActivity" />
+ android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
</Preference>
</PreferenceScreen>
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 3b2ea1a..8a832a9 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -50,6 +50,9 @@
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
import android.hardware.fingerprint.FingerprintManager;
import android.icu.text.MeasureFormat;
import android.icu.text.RelativeDateTimeFormatter;
@@ -1366,4 +1369,50 @@
public static void setEditTextCursorPosition(EditText editText) {
editText.setSelection(editText.getText().length());
}
+
+ /**
+ * Sets the preference icon with a drawable that is scaled down to to avoid crashing Settings if
+ * it's too big.
+ */
+ public static void setSafeIcon(Preference pref, Drawable icon) {
+ Drawable safeIcon = icon;
+ if (icon != null) {
+ safeIcon = getSafeDrawable(icon, 500, 500);
+ }
+ pref.setIcon(safeIcon);
+ }
+
+ /**
+ * Gets a drawable with a limited size to avoid crashing Settings if it's too big.
+ *
+ * @param original original drawable, typically an app icon.
+ * @param maxWidth maximum width, in pixels.
+ * @param maxHeight maximum height, in pixels.
+ */
+ public static Drawable getSafeDrawable(Drawable original, int maxWidth, int maxHeight) {
+ final int actualWidth = original.getMinimumWidth();
+ final int actualHeight = original.getMinimumHeight();
+
+ if (actualWidth <= maxWidth && actualHeight <= maxHeight) {
+ return original;
+ }
+
+ float scaleWidth = ((float) maxWidth) / actualWidth;
+ float scaleHeight = ((float) maxHeight) / actualHeight;
+ float scale = Math.min(scaleWidth, scaleHeight);
+ final int width = (int) (actualWidth * scale);
+ final int height = (int) (actualHeight * scale);
+
+ final Bitmap bitmap;
+ if (original instanceof BitmapDrawable) {
+ bitmap = Bitmap.createScaledBitmap(((BitmapDrawable) original).getBitmap(), width,
+ height, false);
+ } else {
+ bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ final Canvas canvas = new Canvas(bitmap);
+ original.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+ original.draw(canvas);
+ }
+ return new BitmapDrawable(null, bitmap);
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index a335c83..fd48c39 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -485,7 +485,7 @@
preference.setKey(componentName.flattenToString());
preference.setTitle(title);
- preference.setIcon(icon);
+ Utils.setSafeIcon(preference, icon);
final boolean serviceEnabled = accessibilityEnabled
&& enabledServices.contains(componentName);
final String serviceState = serviceEnabled ?
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 9edbd86..7ec40f8 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -651,7 +651,11 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- HelpUtils.prepareHelpMenuItem(getActivity(), menu, getHelpResource(), getClass().getName());
+ final Activity activity = getActivity();
+ if (activity == null) {
+ return;
+ }
+ HelpUtils.prepareHelpMenuItem(activity, menu, getHelpResource(), getClass().getName());
mOptionsMenu = menu;
inflater.inflate(R.menu.manage_apps, menu);
updateOptionsMenu();
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index d533d0f..91143b1 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -26,6 +26,7 @@
import android.util.Log;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -54,7 +55,7 @@
CharSequence defaultAppLabel = getDefaultAppLabel();
if (!TextUtils.isEmpty(defaultAppLabel)) {
preference.setSummary(defaultAppLabel);
- preference.setIcon(getDefaultAppIcon());
+ Utils.setSafeIcon(preference, getDefaultAppIcon());
} else {
Log.d(TAG, "No default app");
preference.setSummary(R.string.app_list_preference_none);
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 9c61873..d4397dc 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -31,7 +31,6 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
-import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -47,11 +46,9 @@
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.dashboard.conditional.ConditionAdapter;
import com.android.settings.dashboard.suggestions.SuggestionAdapter;
-import com.android.settings.dashboard.suggestions.SuggestionController;
import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.dashboard.suggestions.SuggestionLogHelper;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.settingslib.drawer.DashboardCategory;
@@ -164,24 +161,6 @@
.setCategory(category)
.build();
notifyDashboardDataChanged(prevData);
- List<Tile> shownSuggestions = null;
- final int mode = mDashboardData.getSuggestionConditionMode();
- if (mode == DashboardData.HEADER_MODE_DEFAULT) {
- shownSuggestions = suggestions.subList(0,
- Math.min(suggestions.size(), DashboardData.DEFAULT_SUGGESTION_COUNT));
- } else if (mode != DashboardData.HEADER_MODE_COLLAPSED) {
- shownSuggestions = suggestions;
- }
- if (shownSuggestions != null) {
- for (Tile suggestion : shownSuggestions) {
- final String identifier = mSuggestionFeatureProvider.getSuggestionIdentifier(
- mContext, suggestion);
- mMetricsFeatureProvider.action(
- mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, identifier,
- getSuggestionTaggedData());
- mSuggestionsShownLogged.add(identifier);
- }
- }
}
public void setSuggestionsV2(List<Suggestion> data) {
@@ -191,7 +170,6 @@
.setSuggestionsV2(data)
.build();
notifyDashboardDataChanged(prevData);
- // TODO: Replicate the metrics logging from setCategoriesAndSuggestions()
}
public void setCategory(DashboardCategory category) {
@@ -331,22 +309,6 @@
mRecyclerView = recyclerView;
}
- public void onPause() {
- if (mDashboardData.getSuggestions() == null) {
- return;
- }
- for (Tile suggestion : mDashboardData.getSuggestions()) {
- String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
- mContext, suggestion);
- if (mSuggestionsShownLogged.contains(suggestionId)) {
- mMetricsFeatureProvider.action(
- mContext, MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION, suggestionId,
- getSuggestionTaggedData());
- }
- }
- mSuggestionsShownLogged.clear();
- }
-
public Object getItem(long itemId) {
return mDashboardData.getItemEntityById(itemId);
}
@@ -375,23 +337,6 @@
}
}
- private void logSuggestions() {
- final List<Tile> suggestions = mDashboardData.getSuggestions();
- if (suggestions == null) {
- return;
- }
- for (Tile suggestion : suggestions) {
- final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
- mContext, suggestion);
- if (!mSuggestionsShownLogged.contains(suggestionId)) {
- mMetricsFeatureProvider.action(
- mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
- getSuggestionTaggedData());
- mSuggestionsShownLogged.add(suggestionId);
- }
- }
- }
-
@VisibleForTesting
void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
SuggestionConditionHeaderData data) {
@@ -460,9 +405,7 @@
holder.itemView.setPadding(0, padding, 0, padding);
holder.itemView.setOnClickListener(v -> {
- if (moreSuggestions) {
- logSuggestions();
- } else if (hasConditions) {
+ if (hasConditions) {
mMetricsFeatureProvider.action(mContext,
MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
}
@@ -587,11 +530,6 @@
parent.setVisibility(View.VISIBLE);
}
- private Pair<Integer, Object>[] getSuggestionTaggedData() {
- return SuggestionLogHelper.getSuggestionTaggedData(
- mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
- }
-
public static class IconCache {
private final Context mContext;
private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 4810c72..30a2fce 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -152,9 +152,6 @@
mMetricsFeatureProvider.hidden(getContext(), c.getMetricsConstant());
}
}
- if (!getActivity().isChangingConfigurations()) {
- mAdapter.onPause();
- }
}
@Override
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index de266e1..8502fa7 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -21,7 +21,6 @@
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
-import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -44,7 +43,7 @@
private final Context mContext;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
- @Deprecated // in favor of mNewSuggestions
+ @Deprecated // in favor of mSuggestionsV2
private final List<Tile> mSuggestions;
private final List<Suggestion> mSuggestionsV2;
private final IconCache mCache;
@@ -88,23 +87,15 @@
mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
mSuggestionsShownLogged.add(id);
}
- // TODO: Add remote view field in Suggestion, and enable this.
- // if (suggestion.remoteViews != null) {
- // final ViewGroup itemView = (ViewGroup) holder.itemView;
- // itemView.removeAllViews();
- // itemView.addView(suggestion.remoteViews.apply(itemView.getContext(),
- // itemView));
- // } else
- {
- holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
- holder.title.setText(suggestion.getTitle());
- final CharSequence summary = suggestion.getSummary();
- if (!TextUtils.isEmpty(summary)) {
- holder.summary.setText(summary);
- holder.summary.setVisibility(View.VISIBLE);
- } else {
- holder.summary.setVisibility(View.GONE);
- }
+
+ holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
+ holder.title.setText(suggestion.getTitle());
+ final CharSequence summary = suggestion.getSummary();
+ if (!TextUtils.isEmpty(summary)) {
+ holder.summary.setText(summary);
+ holder.summary.setVisibility(View.VISIBLE);
+ } else {
+ holder.summary.setVisibility(View.GONE);
}
final View divider = holder.itemView.findViewById(R.id.divider);
if (divider != null) {
@@ -116,8 +107,6 @@
final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
if (primaryAction != null) {
clickHandler = primaryAction;
- // set the item view to disabled to remove any touch effects
- holder.itemView.setEnabled(false);
}
clickHandler.setOnClickListener(v -> {
mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_SUGGESTION, id);
@@ -141,7 +130,7 @@
if (!mSuggestionsShownLogged.contains(suggestionId)) {
mMetricsFeatureProvider.action(
mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
- getSuggestionTaggedData());
+ mSuggestionFeatureProvider.getLoggingTaggedData(mContext));
mSuggestionsShownLogged.add(suggestionId);
}
if (suggestion.remoteViews != null) {
@@ -175,7 +164,7 @@
clickHandler.setOnClickListener(v -> {
mMetricsFeatureProvider.action(mContext,
MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId,
- getSuggestionTaggedData());
+ mSuggestionFeatureProvider.getLoggingTaggedData(mContext));
((SettingsActivity) mContext).startSuggestion(suggestion.intent);
});
}
@@ -198,13 +187,12 @@
? R.layout.suggestion_tile_remote_container
: R.layout.suggestion_tile;
} else {
-
- return R.layout.suggestion_tile;
- // TODO: Add remote view field in Suggestion, and enable this.
- // Suggestion suggestion = getSuggestionsV2(position);
- // return suggestion.remoteViews != null
- // ? R.layout.suggestion_tile_remote_container
- // : R.layout.suggestion_tile;
+ final Suggestion suggestion = getSuggestionsV2(position);
+ if ((suggestion.getFlags() & Suggestion.FLAG_HAS_BUTTON) != 0) {
+ return R.layout.suggestion_tile_with_button;
+ } else {
+ return R.layout.suggestion_tile;
+ }
}
}
@@ -248,11 +236,6 @@
notifyDataSetChanged();
}
- private Pair<Integer, Object>[] getSuggestionTaggedData() {
- return SuggestionLogHelper.getSuggestionTaggedData(
- mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
- }
-
public void removeSuggestion(Suggestion suggestion) {
mSuggestionsV2.remove(suggestion);
notifyDataSetChanged();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index b3636c1..f269f69 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -89,7 +89,7 @@
public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
final int layoutId = viewHolder.getItemViewType();
if (layoutId == R.layout.suggestion_tile
- || layoutId == R.layout.suggestion_tile_remote_container) {
+ || layoutId == R.layout.suggestion_tile_with_button) {
// Only return swipe direction for suggestion tiles. All other types are not swipeable.
return super.getSwipeDirs(recyclerView, viewHolder);
}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 0f8bccc..f911401 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -21,6 +21,7 @@
import android.content.SharedPreferences;
import android.service.settings.suggestions.Suggestion;
import android.support.annotation.NonNull;
+import android.util.Pair;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionParser;
@@ -93,6 +94,14 @@
/**
* Returns an identifier for the suggestion
+ *
+ * @deprecated in favor or {@link Suggestion#getId()}
*/
+ @Deprecated
String getSuggestionIdentifier(Context context, Tile suggestion);
+
+ /**
+ * Returns common tagged data for suggestion logging.
+ */
+ Pair<Integer, Object>[] getLoggingTaggedData(Context context);
}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 02a9223..783987d 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -170,8 +170,7 @@
if (parser == null || suggestion == null || context == null) {
return;
}
- final Pair<Integer, Object>[] taggedData =
- SuggestionLogHelper.getSuggestionTaggedData(isSmartSuggestionEnabled(context));
+ final Pair<Integer, Object>[] taggedData = getLoggingTaggedData(context);
mMetricsFeatureProvider.action(
context, MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
@@ -213,6 +212,14 @@
return packageName;
}
+ @Override
+ public Pair<Integer, Object>[] getLoggingTaggedData(Context context) {
+ final boolean isSmartSuggestionEnabled = isSmartSuggestionEnabled(context);
+ return new Pair[]{Pair.create(
+ MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED,
+ isSmartSuggestionEnabled ? 1 : 0)};
+ }
+
@VisibleForTesting
boolean hasUsedNightDisplay(Context context) {
final ContentResolver cr = context.getContentResolver();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java b/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
deleted file mode 100644
index 339392f..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard.suggestions;
-
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-public class SuggestionLogHelper {
-
- public static Pair<Integer, Object>[] getSuggestionTaggedData(boolean enabled) {
- return new Pair[]{
- Pair.create(
- MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, enabled ? 1 : 0)};
- }
-}
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index d00749d..fb8119c 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -264,7 +264,7 @@
formatter.getUnitDisplayName(MeasureUnit.GIGABYTE)
};
final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
- getContext(), android.R.layout.simple_spinner_item, unitNames);
+ getContext(), R.layout.data_usage_spinner_item, unitNames);
type.setAdapter(adapter);
if (bytes > 1.5f * GB_IN_BYTES) {
diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java
index ed13b73..cf23fe0 100644
--- a/src/com/android/settings/development/AdbPreferenceController.java
+++ b/src/com/android/settings/development/AdbPreferenceController.java
@@ -18,67 +18,44 @@
import android.content.Context;
-import android.content.Intent;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v4.content.LocalBroadcastManager;
+import android.support.annotation.Nullable;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-public class AdbPreferenceController extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
- public static final String ADB_STATE_CHANGED =
- "com.android.settings.development.AdbPreferenceController.ADB_STATE_CHANGED";
- public static final int ADB_SETTING_ON = 1;
- public static final int ADB_SETTING_OFF = 0;
-
- private static final String KEY_ENABLE_ADB = "enable_adb";
+public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements
+ PreferenceControllerMixin {
private final DevelopmentSettingsDashboardFragment mFragment;
- private SwitchPreference mPreference;
public AdbPreferenceController(Context context, DevelopmentSettingsDashboardFragment fragment) {
super(context);
mFragment = fragment;
}
- @Override
- public boolean isAvailable() {
- return mContext.getSystemService(UserManager.class).isAdminUser();
+ public void onAdbDialogConfirmed() {
+ writeAdbSetting(true);
+ }
+
+ public void onAdbDialogDismissed() {
+ updateState(mPreference);
}
@Override
- public String getPreferenceKey() {
- return KEY_ENABLE_ADB;
+ public void showConfirmationDialog(@Nullable Preference preference) {
+ EnableAdbWarningDialog.show(mFragment);
}
@Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ public void dismissConfirmationDialog() {
+ // intentional no-op
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean isAdbEnabled = (Boolean) newValue;
- if (isAdbEnabled) {
- EnableAdbWarningDialog.show(mFragment);
- } else {
- writeAdbSetting(isAdbEnabled);
- notifyStateChanged();
- }
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- final int adbMode = Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.ADB_ENABLED, 0 /* default */);
- mPreference.setChecked(adbMode != ADB_SETTING_OFF);
+ public boolean isConfirmationDialogShowing() {
+ // intentional no-op
+ return false;
}
@Override
@@ -89,28 +66,7 @@
@Override
protected void onDeveloperOptionsSwitchDisabled() {
writeAdbSetting(false);
- notifyStateChanged();
mPreference.setEnabled(false);
mPreference.setChecked(false);
}
-
- public void onAdbDialogConfirmed() {
- writeAdbSetting(true);
- notifyStateChanged();
- }
-
- public void onAdbDialogDismissed() {
- updateState(mPreference);
- }
-
- private void writeAdbSetting(boolean enabled) {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ADB_ENABLED, enabled ? ADB_SETTING_ON : ADB_SETTING_OFF);
- }
-
- @VisibleForTesting
- void notifyStateChanged() {
- LocalBroadcastManager.getInstance(mContext)
- .sendBroadcast(new Intent(ADB_STATE_CHANGED));
- }
}
diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
index fb69455..c3b527f 100644
--- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
+++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class AllowAppsOnExternalPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
index 3f454ea..98d7fa5 100644
--- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
+++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
@@ -22,8 +22,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class AppsNotRespondingPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
index 8e6df8e..64f6440 100644
--- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothAbsoluteVolumePreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
"bluetooth_disable_absolute_volume";
diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
index cd2915f..654a531 100644
--- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothDeviceNoNamePreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
"bluetooth_show_devices_without_names";
diff --git a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
index 250e84a..db5a881 100644
--- a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
@@ -24,8 +24,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothInbandRingingPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY =
"bluetooth_enable_inband_ringing";
diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
index 16a549e..56cfd73 100644
--- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothSnoopLogPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String PREFERENCE_KEY = "bt_hci_snoop_log";
@VisibleForTesting
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java b/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java
index 34a95a6..0ab826f 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java
@@ -26,10 +26,13 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class BugReportInPowerPreferenceControllerV2 extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
diff --git a/src/com/android/settings/development/BugReportPreferenceControllerV2.java b/src/com/android/settings/development/BugReportPreferenceControllerV2.java
index 7df23a6..38dece8 100644
--- a/src/com/android/settings/development/BugReportPreferenceControllerV2.java
+++ b/src/com/android/settings/development/BugReportPreferenceControllerV2.java
@@ -19,7 +19,11 @@
import android.content.Context;
import android.os.UserManager;
-public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements
+ PreferenceControllerMixin {
private static final String KEY_BUGREPORT = "bugreport";
diff --git a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java b/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java
index 2005623..cb03bfc 100644
--- a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java
+++ b/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java
@@ -26,10 +26,12 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraHalHdrPlusPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
@VisibleForTesting
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java b/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java
index c3a5f16..43943ac 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java
@@ -26,10 +26,12 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraLaserSensorPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
@VisibleForTesting
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
index 9c93280..2248b89 100644
--- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
@@ -28,7 +28,11 @@
import android.text.TextUtils;
import android.util.Log;
-public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController {
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ClearAdbKeysPreferenceController extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "ClearAdbPrefCtrl";
private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java
index 1fe2a0f..fdcecfb 100644
--- a/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java
+++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java
@@ -26,9 +26,12 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ConnectivityMonitorPreferenceControllerV2 extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";
@VisibleForTesting
diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
index 894435a..aa954c0 100644
--- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
+++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
@@ -25,11 +25,13 @@
import android.widget.Toast;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class CoolColorTemperaturePreferenceController extends
DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
index 080c921..caf23fa 100644
--- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
+++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class DebugViewAttributesPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String DEBUG_VIEW_ATTRIBUTES_KEY = "debug_view_attributes";
diff --git a/src/com/android/settings/development/DeveloperOptionsPreferenceController.java b/src/com/android/settings/development/DeveloperOptionsPreferenceController.java
deleted file mode 100644
index 431d999..0000000
--- a/src/com/android/settings/development/DeveloperOptionsPreferenceController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * This controller is used handle changes for the master switch in the developer options page.
- *
- * All Preference Controllers that are a part of the developer options page should inherit this
- * class.
- */
-public abstract class DeveloperOptionsPreferenceController extends
- AbstractPreferenceController implements PreferenceControllerMixin {
-
- public DeveloperOptionsPreferenceController(Context context) {
- super(context);
- }
-
- /**
- * Called when an activity returns to the DeveloperSettingsDashboardFragment.
- *
- * @param requestCode The integer request code originally supplied to
- * startActivityForResult(), allowing you to identify who this
- * result came from.
- * @param resultCode The integer result code returned by the child activity
- * through its setResult().
- * @param data An Intent, which can return result data to the caller
- * (various data can be attached to Intent "extras").
- * @return true if the controller handled the activity result
- */
- public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
- return false;
- }
-
- /**
- * Child classes should override this method to create custom logic for hiding preferences.
- *
- * @return true if the preference is to be displayed.
- */
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- /**
- * Called when developer options is enabled
- */
- public void onDeveloperOptionsEnabled() {
- if (isAvailable()) {
- onDeveloperOptionsSwitchEnabled();
- }
- }
-
- /**
- * Called when developer options is disabled
- */
- public void onDeveloperOptionsDisabled() {
- if (isAvailable()) {
- onDeveloperOptionsSwitchDisabled();
- }
- }
-
- /**
- * Called when developer options is enabled and the preference is available
- */
- protected abstract void onDeveloperOptionsSwitchEnabled();
-
- /**
- * Called when developer options is disabled and the preference is available
- */
- protected abstract void onDeveloperOptionsSwitchDisabled();
-
-}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index a867330..39e3d03 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -42,6 +42,7 @@
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
@@ -182,11 +183,11 @@
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
for (AbstractPreferenceController controller : mPreferenceControllers) {
- if (controller instanceof DeveloperOptionsPreferenceController) {
+ if (controller instanceof OnActivityResultListener) {
// We do not break early because it is possible for multiple controllers to
// handle the same result code.
handledResult |=
- ((DeveloperOptionsPreferenceController) controller).onActivityResult(
+ ((OnActivityResultListener) controller).onActivityResult(
requestCode, resultCode, data);
}
}
@@ -221,7 +222,7 @@
private void registerReceivers() {
LocalBroadcastManager.getInstance(getContext())
.registerReceiver(mEnableAdbReceiver, new IntentFilter(
- AdbPreferenceController.ADB_STATE_CHANGED));
+ AdbPreferenceController.ACTION_ENABLE_ADB_STATE_CHANGED));
}
private void unregisterReceivers() {
@@ -268,7 +269,7 @@
controllers.add(new SelectDebugAppPreferenceController(context, fragment));
controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
- // logger buffer sizes
+ controllers.add(new LogdSizePreferenceControllerV2(context));
// store logger data persistently on device
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
@@ -280,7 +281,7 @@
controllers.add(new WifiRoamScansPreferenceController(context));
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
controllers.add(new TetheringHardwareAccelPreferenceController(context));
- // select usb configuration
+ controllers.add(new SelectUsbConfigPreferenceController(context, lifecycle));
controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
controllers.add(new BluetoothInbandRingingPreferenceController(context));
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
index 4bd7d8c..4090462 100644
--- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
@@ -23,9 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class DisableAutomaticUpdatesPreferenceController extends
DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
index 463bb70..0a6b4fa 100644
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -27,8 +27,11 @@
import android.text.TextUtils;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController {
+public class FileEncryptionPreferenceController extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
private static final String KEY_STORAGE_MANAGER = "mount";
diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
index 9c56f65..83f7930 100644
--- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
+++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
@@ -23,10 +23,13 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ForceGpuRenderingPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
index 69436be..2d2fd95 100644
--- a/src/com/android/settings/development/ForceMSAAPreferenceController.java
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java
@@ -23,10 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String FORCE_MSAA_KEY = "force_msaa";
diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
index 1538da4..cccb38b 100644
--- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
@@ -23,10 +23,13 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class GpuViewUpdatesPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
index abab0ab..967839e 100644
--- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
@@ -23,10 +23,13 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class HardwareLayersUpdatesPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";
diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
index e6d4798..c2f7c54 100644
--- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
+++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
@@ -26,8 +26,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
index a443f87..60264ef 100644
--- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java
+++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
@@ -26,10 +26,13 @@
import android.text.TextUtils;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class HdcpCheckingPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
index 437fd9d..aab4d1f 100644
--- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java
+++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
@@ -26,8 +26,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY =
"immediately_destroy_activities";
diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
index b509448..e52b073 100644
--- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
@@ -26,8 +26,11 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController {
+public class LocalBackupPasswordPreferenceController extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java
index cda6e27..17a5785 100644
--- a/src/com/android/settings/development/LocalTerminalPreferenceController.java
+++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java
@@ -8,10 +8,13 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class LocalTerminalPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String ENABLE_TERMINAL_KEY = "enable_terminal";
diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java
index b12884c..8ee3405 100644
--- a/src/com/android/settings/development/LogdSizePreferenceController.java
+++ b/src/com/android/settings/development/LogdSizePreferenceController.java
@@ -21,6 +21,10 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.AbstractLogdSizePreferenceController;
+/**
+ * deprecated in favor of {@link LogdSizePreferenceControllerV2}
+ */
+@Deprecated
public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/LogdSizePreferenceControllerV2.java b/src/com/android/settings/development/LogdSizePreferenceControllerV2.java
new file mode 100644
index 0000000..8194c48
--- /dev/null
+++ b/src/com/android/settings/development/LogdSizePreferenceControllerV2.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractLogdSizePreferenceController;
+
+public class LogdSizePreferenceControllerV2 extends AbstractLogdSizePreferenceController implements
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+ private ListPreference mPreference;
+
+ public LogdSizePreferenceControllerV2(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ updateLogdSizeValues();
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ writeLogdSizeOption(null /* new value */);
+ mPreference.setEnabled(false);
+ }
+}
diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
index a98bf20..eafcb5c 100644
--- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class MobileDataAlwaysOnPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java
index 9f6c4d3..8305a9d 100644
--- a/src/com/android/settings/development/MockLocationAppPreferenceController.java
+++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java
@@ -31,11 +31,15 @@
import android.text.TextUtils;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.List;
-public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController {
+public class MockLocationAppPreferenceController extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
+ OnActivityResultListener {
private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};
diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
index c0382f2..15a1532 100644
--- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
@@ -24,8 +24,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class NotificationChannelWarningsPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY =
"show_notification_channel_warnings";
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index cb391a8..91994c2 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -32,11 +32,13 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener {
private static final String PREFERENCE_KEY = "oem_unlock_enable";
diff --git a/src/com/android/settings/development/OnActivityResultListener.java b/src/com/android/settings/development/OnActivityResultListener.java
new file mode 100644
index 0000000..6763653
--- /dev/null
+++ b/src/com/android/settings/development/OnActivityResultListener.java
@@ -0,0 +1,22 @@
+package com.android.settings.development;
+
+import android.content.Intent;
+
+/**
+ * Interface for activity result callbacks in the {@link DevelopmentSettingsDashboardFragment}
+ */
+public interface OnActivityResultListener {
+ /**
+ * Called when an activity returns to the {@link DevelopmentSettingsDashboardFragment}.
+ *
+ * @param requestCode The integer request code originally supplied to
+ * startActivityForResult(), allowing you to identify who this
+ * result came from.
+ * @param resultCode The integer result code returned by the child activity
+ * through its setResult().
+ * @param data An Intent, which can return result data to the caller
+ * (various data can be attached to Intent "extras").
+ * @return true if the controller handled the result.
+ */
+ boolean onActivityResult(int requestCode, int resultCode, Intent data);
+}
diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java
index fe4755f..07df1e9 100644
--- a/src/com/android/settings/development/PictureColorModePreferenceController.java
+++ b/src/com/android/settings/development/PictureColorModePreferenceController.java
@@ -20,14 +20,16 @@
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class PictureColorModePreferenceController extends
DeveloperOptionsPreferenceController implements
- LifecycleObserver, OnResume, OnPause {
+ LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
private static final String KEY_COLOR_MODE = "picture_color_mode";
diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java
index 55c8fee..98298af 100644
--- a/src/com/android/settings/development/PointerLocationPreferenceController.java
+++ b/src/com/android/settings/development/PointerLocationPreferenceController.java
@@ -23,8 +23,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String POINTER_LOCATION_KEY = "pointer_location";
diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java
index 70be4b6..d192e11 100644
--- a/src/com/android/settings/development/ResizableActivityPreferenceController.java
+++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ResizableActivityPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
index 364ee9d..6729e76 100644
--- a/src/com/android/settings/development/RtlLayoutPreferenceController.java
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java
@@ -25,9 +25,11 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.app.LocalePicker;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
index 162fe6d..1037f91 100644
--- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -30,9 +30,13 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
-public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController {
+public class SelectDebugAppPreferenceController extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
+ OnActivityResultListener {
private static final String DEBUG_APP_KEY = "debug_app";
diff --git a/src/com/android/settings/development/SelectUsbConfigPreferenceController.java b/src/com/android/settings/development/SelectUsbConfigPreferenceController.java
new file mode 100644
index 0000000..59ac23f
--- /dev/null
+++ b/src/com/android/settings/development/SelectUsbConfigPreferenceController.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class SelectUsbConfigPreferenceController extends
+ DeveloperOptionsPreferenceController implements
+ Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
+ PreferenceControllerMixin {
+
+ private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
+
+ private final String[] mListValues;
+ private final String[] mListSummaries;
+ private final UsbManager mUsbManager;
+ private BroadcastReceiver mUsbReceiver;
+ private ListPreference mPreference;
+
+ public SelectUsbConfigPreferenceController(Context context, Lifecycle lifecycle) {
+ super(context);
+
+ mListValues = context.getResources().getStringArray(R.array.usb_configuration_values);
+ mListSummaries = context.getResources().getStringArray(R.array.usb_configuration_titles);
+ mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
+ mUsbReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (mPreference != null) {
+ updateUsbConfigurationValues();
+ }
+ }
+ };
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(UsbManager.ACTION_USB_STATE);
+ mContext.registerReceiver(mUsbReceiver, filter);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return USB_CONFIGURATION_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ writeUsbConfigurationOption(newValue.toString());
+ updateUsbConfigurationValues();
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ updateUsbConfigurationValues();
+ }
+
+ @Override
+ public void onDestroy() {
+ mContext.unregisterReceiver(mUsbReceiver);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ mPreference.setEnabled(false);
+ }
+
+ @VisibleForTesting
+ void setCurrentFunction(String newValue, boolean usbDataUnlocked) {
+ mUsbManager.setCurrentFunction(newValue, usbDataUnlocked);
+ }
+
+ private void updateUsbConfigurationValues() {
+ int index = 0;
+ for (int i = 0; i < mListValues.length; i++) {
+ if (mUsbManager.isFunctionEnabled(mListValues[i])) {
+ index = i;
+ break;
+ }
+ }
+ mPreference.setValue(mListValues[index]);
+ mPreference.setSummary(mListSummaries[index]);
+ }
+
+ private void writeUsbConfigurationOption(String newValue) {
+ if (TextUtils.equals(newValue, "none")) {
+ setCurrentFunction(newValue, false);
+ } else {
+ setCurrentFunction(newValue, true);
+ }
+ }
+
+}
diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
index c8fdaec..0ef2561 100644
--- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
+++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
@@ -26,9 +26,11 @@
import android.widget.Toast;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ShortcutManagerThrottlingPreferenceController extends
- DeveloperOptionsPreferenceController {
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "ShortcutMgrPrefCtrl";
diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
index fa13a58..ad4a44e 100644
--- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
@@ -23,10 +23,12 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String DEBUG_LAYOUT_KEY = "debug_layout";
diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
index 7c893be..1202759 100644
--- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
@@ -26,8 +26,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java
index 6ac9c7e..ce7d4bd 100644
--- a/src/com/android/settings/development/ShowTapsPreferenceController.java
+++ b/src/com/android/settings/development/ShowTapsPreferenceController.java
@@ -23,8 +23,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String SHOW_TOUCHES_KEY = "show_touches";
diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java
index 8e0d38c..1296770 100644
--- a/src/com/android/settings/development/StayAwakePreferenceController.java
+++ b/src/com/android/settings/development/StayAwakePreferenceController.java
@@ -27,17 +27,19 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver,
- OnResume, OnPause {
+ OnResume, OnPause, PreferenceControllerMixin {
private static final String TAG = "StayAwakeCtrl";
private static final String PREFERENCE_KEY = "keep_screen_on";
diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java
index 037f66e..7a4a069 100644
--- a/src/com/android/settings/development/StrictModePreferenceController.java
+++ b/src/com/android/settings/development/StrictModePreferenceController.java
@@ -25,11 +25,13 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
import android.view.IWindowManager;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String STRICT_MODE_KEY = "strict_mode";
private static final String WINDOW_MANAGER_KEY = "window";
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
index c54fc5b..ed14382 100644
--- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class TetheringHardwareAccelPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
index 3cd2a2b..1e5febd 100644
--- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
+++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
@@ -23,8 +23,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener {
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String USB_AUDIO_KEY = "usb_audio";
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java
index 76c8669..6e3035e 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java
@@ -26,9 +26,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.List;
@@ -38,7 +40,7 @@
*/
public class VerifyAppsOverUsbPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
- AdbOnChangeListener {
+ AdbOnChangeListener, PreferenceControllerMixin {
private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
index 2ca887a..ec259be 100644
--- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -32,8 +32,12 @@
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WaitForDebuggerPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin, OnActivityResultListener {
private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
diff --git a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
index 61a98aa..87ddb81 100644
--- a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
+++ b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.pm.PackageInfo;
-import android.graphics.drawable.Drawable;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -27,10 +26,13 @@
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
-public class WebViewAppPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
+public class WebViewAppPreferenceControllerV2 extends
+ DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "WebViewAppPrefCtrl";
private static final String WEBVIEW_APP_KEY = "select_webview_provider";
@@ -64,11 +66,9 @@
final CharSequence defaultAppLabel = getDefaultAppLabel();
if (!TextUtils.isEmpty(defaultAppLabel)) {
mPreference.setSummary(defaultAppLabel);
- mPreference.setIcon(getDefaultAppIcon());
} else {
Log.d(TAG, "No default app");
mPreference.setSummary(R.string.app_list_preference_none);
- mPreference.setIcon(null);
}
}
@@ -89,11 +89,6 @@
currentPackage == null ? null : currentPackage.applicationInfo);
}
- private Drawable getDefaultAppIcon() {
- final DefaultAppInfo app = getDefaultAppInfo();
- return app.loadIcon();
- }
-
private CharSequence getDefaultAppLabel() {
final DefaultAppInfo app = getDefaultAppInfo();
return app.loadLabel();
diff --git a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
index 007d7d0..aa607ce 100644
--- a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
+++ b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiAggressiveHandoverPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
index 399d6d8..5de3071 100644
--- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
+++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
@@ -23,9 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiDisplayCertificationPreferenceController extends
DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener {
+ Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
diff --git a/src/com/android/settings/development/WifiRoamScansPreferenceController.java b/src/com/android/settings/development/WifiRoamScansPreferenceController.java
index e9d2fd4..b3ff400 100644
--- a/src/com/android/settings/development/WifiRoamScansPreferenceController.java
+++ b/src/com/android/settings/development/WifiRoamScansPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiRoamScansPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
index 4a05d84..ad2b7eb 100644
--- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -23,8 +23,12 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiVerboseLoggingPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
index 382c692..3791d89 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.anomaly;
import android.content.Context;
+import android.net.Uri;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.text.format.DateUtils;
@@ -25,6 +26,10 @@
import com.android.settings.wrapper.KeyValueListParserWrapper;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
/**
* Class to store the policy for anomaly detection, which comes from
* {@link android.provider.Settings.Global}
@@ -45,6 +50,8 @@
@VisibleForTesting
static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
@VisibleForTesting
+ static final String KEY_WAKEUP_BLACKLISTED_TAGS = "wakeup_blacklisted_tags";
+ @VisibleForTesting
static final String KEY_BLUETOOTH_SCAN_THRESHOLD = "bluetooth_scan_threshold";
/**
@@ -96,6 +103,14 @@
public final long wakeupAlarmThreshold;
/**
+ * Array of blacklisted wakeups, by tag.
+ *
+ * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+ * @see #KEY_WAKEUP_BLACKLISTED_TAGS
+ */
+ public final Set<String> wakeupBlacklistedTags;
+
+ /**
* Threshold for bluetooth unoptimized scanning time in milli seconds
*
* @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
@@ -121,15 +136,18 @@
Log.e(TAG, "Bad anomaly detection constants");
}
- anomalyDetectionEnabled = mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, true);
- wakeLockDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED, true);
- wakeupAlarmDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,
- false);
+ anomalyDetectionEnabled =
+ mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, false);
+ wakeLockDetectionEnabled =
+ mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED,false);
+ wakeupAlarmDetectionEnabled =
+ mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,false);
bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(
- KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
+ KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
DateUtils.HOUR_IN_MILLIS);
- wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);
+ wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 10);
+ wakeupBlacklistedTags = parseStringSet(KEY_WAKEUP_BLACKLISTED_TAGS, null);
bluetoothScanThreshold = mParserWrapper.getLong(KEY_BLUETOOTH_SCAN_THRESHOLD,
30 * DateUtils.MINUTE_IN_MILLIS);
}
@@ -150,4 +168,14 @@
return false; // Disabled when no this type
}
}
+
+ private Set<String> parseStringSet(final String key, final Set<String> defaultSet) {
+ final String value = mParserWrapper.getString(key, null);
+ if (value != null) {
+ return Arrays.stream(value.split(":"))
+ .map(String::trim).map(Uri::decode).collect(Collectors.toSet());
+ } else {
+ return defaultSet;
+ }
+ }
}
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
index 8823a17..46f31ab 100644
--- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
@@ -21,6 +21,8 @@
import android.support.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.Log;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -29,10 +31,12 @@
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Check whether apps has too many wakeup alarms
@@ -42,6 +46,7 @@
@VisibleForTesting
BatteryUtils mBatteryUtils;
private long mWakeupAlarmThreshold;
+ private Set<String> mWakeupBlacklistedTags;
private Context mContext;
private AnomalyUtils mAnomalyUtils;
@@ -56,6 +61,7 @@
mBatteryUtils = BatteryUtils.getInstance(context);
mAnomalyUtils = anomalyUtils;
mWakeupAlarmThreshold = policy.wakeupAlarmThreshold;
+ mWakeupBlacklistedTags = policy.wakeupBlacklistedTags;
}
@Override
@@ -123,11 +129,14 @@
final BatteryStats.Uid.Pkg ps = packageStats.valueAt(ipkg);
final ArrayMap<String, ? extends BatteryStats.Counter> alarms =
ps.getWakeupAlarmStats();
- for (int iwa = alarms.size() - 1; iwa >= 0; iwa--) {
- int count = alarms.valueAt(iwa).getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+ for (Map.Entry<String, ? extends BatteryStats.Counter> alarm : alarms.entrySet()) {
+ if (mWakeupBlacklistedTags != null
+ && mWakeupBlacklistedTags.contains(alarm.getKey())) {
+ continue;
+ }
+ int count = alarm.getValue().getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
wakeups += count;
}
-
}
return wakeups;
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index 4abdd7e..86576cf 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -85,6 +85,12 @@
}
mId = intent.getStringExtra(ConditionProviderService.EXTRA_RULE_ID);
+ if (mId == null) {
+ Log.w(TAG, "rule id is null");
+ toastAndFinish();
+ return;
+ }
+
if (DEBUG) Log.d(TAG, "mId=" + mId);
if (refreshRuleOrFinish()) {
return;
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 6854793..d736319 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -17,6 +17,9 @@
package com.android.settings.widget;
import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
@@ -154,7 +157,7 @@
public RadioButtonPreference bindPreference(RadioButtonPreference pref,
String key, CandidateInfo info, String defaultKey) {
pref.setTitle(info.loadLabel());
- pref.setIcon(info.loadIcon());
+ Utils.setSafeIcon(pref, info.loadIcon());
pref.setKey(key);
if (TextUtils.equals(defaultKey, key)) {
pref.setChecked(true);
diff --git a/src/com/android/settings/wrapper/KeyValueListParserWrapper.java b/src/com/android/settings/wrapper/KeyValueListParserWrapper.java
index 16dc50e..3fab571 100644
--- a/src/com/android/settings/wrapper/KeyValueListParserWrapper.java
+++ b/src/com/android/settings/wrapper/KeyValueListParserWrapper.java
@@ -56,13 +56,23 @@
* Get the value for key as a boolean.
* @param key The key to lookup.
* @param defaultValue The value to return if the key was not found.
- * @return the string value associated with the key.
+ * @return the boolean value associated with the key.
*/
public boolean getBoolean(String key, boolean defaultValue) {
return mParser.getBoolean(key, defaultValue);
}
/**
+ * Get the value for key as a string.
+ * @param key The key to lookup.
+ * @param defaultValue The value to return if the key was not found.
+ * @return the string value associated with the key.
+ */
+ public String getString(String key, String defaultValue) {
+ return mParser.getString(key, defaultValue);
+ }
+
+ /**
* Get the value for key as a long.
* @param key The key to lookup.
* @param defaultValue The value to return if the key was not found, or the value was not a
diff --git a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
index 750bc05..79aeb93 100644
--- a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
+++ b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
@@ -18,15 +18,17 @@
import android.app.PendingIntent;
import android.graphics.drawable.Icon;
-import android.os.Parcel;
import android.text.TextUtils;
-import android.widget.RemoteViews;
public class Suggestion {
+
+ public static final int FLAG_HAS_BUTTON = 1 << 0;
+
private final String mId;
private final CharSequence mTitle;
private final CharSequence mSummary;
private final Icon mIcon;
+ private final int mFlags;
private final PendingIntent mPendingIntent;
/**
@@ -57,6 +59,10 @@
return mIcon;
}
+ public int getFlags() {
+ return mFlags;
+ }
+
/**
* The Intent to launch when the suggestion is activated.
*/
@@ -70,13 +76,16 @@
mIcon = builder.mIcon;
mPendingIntent = builder.mPendingIntent;
mId = builder.mId;
+ mFlags = builder.mFlags;
}
/**
* Builder class for {@link Suggestion}.
*/
public static class Builder {
+
private final String mId;
+ private int mFlags;
private CharSequence mTitle;
private CharSequence mSummary;
private Icon mIcon;
@@ -114,6 +123,11 @@
return this;
}
+ public Builder setFlags(int flags) {
+ mFlags = flags;
+ return this;
+ }
+
/**
* Sets suggestion intent
*/
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 595a9c6..14da5d6 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -24,7 +24,6 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -39,12 +38,10 @@
import android.service.settings.suggestions.Suggestion;
import android.support.v7.widget.RecyclerView;
import android.util.DisplayMetrics;
-import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.RelativeLayout;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
@@ -61,8 +58,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -88,12 +83,6 @@
private Condition mCondition;
@Mock
private Resources mResources;
- @Captor
- private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
- @Captor
- private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
- @Captor
- private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
private FakeFeatureFactory mFactory;
private DashboardAdapter mDashboardAdapter;
private DashboardAdapter.SuggestionAndConditionHeaderHolder mSuggestionHolder;
@@ -110,7 +99,7 @@
.getSuggestionIdentifier(any(Context.class), any(Tile.class)))
.thenAnswer(invocation -> {
final Object[] args = invocation.getArguments();
- return ((Tile)args[1]).intent.getComponent().getPackageName();
+ return ((Tile) args[1]).intent.getComponent().getPackageName();
});
when(mContext.getResources()).thenReturn(mResources);
@@ -126,282 +115,6 @@
}
@Test
- public void testSuggestionsLogs_NotExpanded() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- verify(mFactory.metricsFeatureProvider, times(2)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg2");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_NotExpandedAndPaused() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(4)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg2", "pkg1", "pkg2");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_Expanded() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
-
- verify(mFactory.metricsFeatureProvider, times(3)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg2", "pkg3");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedAndPaused() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(6)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedAfterPause() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- mDashboardAdapter.onPause();
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
-
- verify(mFactory.metricsFeatureProvider, times(7)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
- setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
- mDashboardAdapter.onPause();
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(10)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
- setupSuggestions(makeSuggestions("pkg1"));
-
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
-
- verify(mFactory.metricsFeatureProvider, times(1)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
- setupSuggestions(makeSuggestions("pkg1"));
-
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(2)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
- setupSuggestions(makeSuggestions("pkg1"));
-
- mDashboardAdapter.onPause();
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
-
- verify(mFactory.metricsFeatureProvider, times(3)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1", "pkg1");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
- setupSuggestions(makeSuggestions("pkg1"));
- mDashboardAdapter.onPause();
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(4)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
- "pkg1", "pkg1", "pkg1", "pkg1");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testSuggestionsLogs_SmartSuggestionEnabled() {
- when(mFactory.suggestionsFeatureProvider
- .isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
- setupSuggestions(makeSuggestions("pkg1"));
-
- mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
- mSuggestionHolder.itemView.callOnClick();
- mDashboardAdapter.onPause();
-
- verify(mFactory.metricsFeatureProvider, times(2)).action(
- any(Context.class), mActionCategoryCaptor.capture(),
- mActionPackageCaptor.capture(),
- mTaggedDataCaptor.capture());
- assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
- MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
- assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
- assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1),
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
- }
-
- @Test
public void testSuggestionsLogs_nullSuggestionsList_shouldNotCrash() {
setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
@@ -618,6 +331,10 @@
verify(data).setAdapter(any(ConditionAdapter.class));
}
+ /**
+ * @deprecated in favor of {@link #makeSuggestionsV2(String...)}
+ */
+ @Deprecated
private List<Tile> makeSuggestions(String... pkgNames) {
final List<Tile> suggestions = new ArrayList<>();
for (String pkgName : pkgNames) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index 6b80465..825b388 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -39,6 +39,7 @@
import android.widget.RemoteViews;
import android.widget.TextView;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
@@ -66,7 +67,7 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private SettingsActivity mActivity;
-
+ private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private SuggestionAdapter mSuggestionAdapter;
private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
@@ -79,7 +80,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- FakeFeatureFactory.setupForTest(mActivity);
+ mFeatureFactory = FakeFeatureFactory.setupForTest(mActivity);
final Tile suggestion1 = new Tile();
final Tile suggestion2 = new Tile();
@@ -144,6 +145,21 @@
}
@Test
+ public void getItemType_hasButton_shouldReturnSuggestionWithButton() {
+ final List<Suggestion> suggestions = new ArrayList<>();
+ suggestions.add(new Suggestion.Builder("id")
+ .setFlags(Suggestion.FLAG_HAS_BUTTON)
+ .setTitle("123")
+ .setSummary("456")
+ .build());
+ mSuggestionAdapter = new SuggestionAdapter(mContext, null /* suggestions */,
+ suggestions, new ArrayList<>());
+
+ assertThat(mSuggestionAdapter.getItemViewType(0))
+ .isEqualTo(R.layout.suggestion_tile_with_button);
+ }
+
+ @Test
public void onBindViewHolder_shouldSetListener() {
final View view = spy(LayoutInflater.from(mContext).inflate(
R.layout.suggestion_tile, new LinearLayout(mContext), true));
@@ -157,6 +173,24 @@
}
@Test
+ public void onBindViewHolder_shouldLog() {
+ final View view = spy(LayoutInflater.from(mContext).inflate(
+ R.layout.suggestion_tile, new LinearLayout(mContext), true));
+ mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
+ mSuggestionAdapter = new SuggestionAdapter(mContext, null /* suggestionV1*/,
+ mOneSuggestionV2, new ArrayList<>());
+
+ // Bind twice
+ mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+ mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+ // Log once
+ verify(mFeatureFactory.metricsFeatureProvider).action(
+ mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+ mOneSuggestionV2.get(0).getId());
+ }
+
+ @Test
public void onBindViewHolder_shouldInflateRemoteView() {
List<Tile> packages = makeSuggestions("pkg1");
RemoteViews remoteViews = mock(RemoteViews.class);
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
index 93bc549..4aced2f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -92,7 +92,7 @@
@Test
public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
- when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
+ when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_with_button);
assertThat(mController.getSwipeDirs(mRecyclerView, vh))
.isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index 69b76fa..5e56714 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
@@ -313,4 +314,19 @@
new ComponentName(mContext, NightDisplaySuggestionActivity.class);
assertThat(mProvider.isSuggestionComplete(mContext, componentName)).isFalse();
}
+
+ @Test
+ public void testGetSmartSuggestionEnabledTaggedData_disabled() {
+ assertThat(mProvider.getLoggingTaggedData(mContext)).asList().containsExactly(
+ Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
+ }
+
+ @Test
+ public void testGetSmartSuggestionEnabledTaggedData_enabled() {
+ final SuggestionFeatureProvider provider = spy(mProvider);
+ when(provider.isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
+
+ assertThat(provider.getLoggingTaggedData(mContext)).asList().containsExactly(
+ Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
deleted file mode 100644
index 01d253f..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionLogHelperTest {
-
- @Test
- public void testGetSmartSuggestionEnabledTaggedData_disabled() {
- assertThat(SuggestionLogHelper.getSuggestionTaggedData(false)).asList().containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
- }
-
- @Test
- public void testGetSmartSuggestionEnabledTaggedData_enabled() {
- assertThat(SuggestionLogHelper.getSuggestionTaggedData(true)).asList().containsExactly(
- Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
- }
-}
-
diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
index 25353ab..ddcd850 100644
--- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
@@ -18,12 +18,11 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.ContentResolver;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
@@ -44,8 +43,7 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdbPreferenceControllerTest {
- @Mock
- private Context mContext;
+
@Mock
private SwitchPreference mPreference;
@Mock
@@ -55,71 +53,24 @@
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
- private ContentResolver mContentResolver;
+ private Context mContext;
private AdbPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mContext = RuntimeEnvironment.application;
mController = spy(new AdbPreferenceController(mContext, mFragment));
- doNothing().when(mController).notifyStateChanged();
- when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
- when(mContext.getContentResolver()).thenReturn(mContentResolver);
+ doReturn(true).when(mController).isAvailable();
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
- public void isAvailable_notAdmin_shouldBeFalse() {
- when(mUserManager.isAdminUser()).thenReturn(false);
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void isAvailable_isAdmin_shouldBeTrue() {
- when(mUserManager.isAdminUser()).thenReturn(true);
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void onPreferenceChanged_settingDisabled_shouldTurnOffAdb() {
- when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
- mController.onPreferenceChange(null, false);
-
- final int mode = Settings.System.getInt(mContentResolver,
- Settings.Global.ADB_ENABLED, -1);
-
- assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
- }
-
- @Test
- public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
- AdbPreferenceController.ADB_SETTING_ON);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
- AdbPreferenceController.ADB_SETTING_OFF);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
- when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
- when(mUserManager.isAdminUser()).thenReturn(true);
mController.onDeveloperOptionsDisabled();
- final int mode = Settings.System.getInt(mContentResolver,
+ final int mode = Settings.System.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
@@ -138,7 +89,7 @@
@Test
public void onAdbDialogConfirmed_shouldEnableAdbSetting() {
mController.onAdbDialogConfirmed();
- final int mode = Settings.System.getInt(mContentResolver,
+ final int mode = Settings.System.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_ON);
@@ -146,7 +97,7 @@
@Test
public void onAdbDialogDismissed_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
+ Settings.System.putInt(mContext.getContentResolver(), Settings.Global.ADB_ENABLED,
AdbPreferenceController.ADB_SETTING_OFF);
mController.onAdbDialogDismissed();
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index ddf5365..ec51868 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -34,6 +34,7 @@
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import org.junit.After;
@@ -243,7 +244,7 @@
}
}
- @Implements(AdbPreferenceController.class)
+ @Implements(AbstractEnableAdbPreferenceController.class)
public static class ShadowAdbPreferenceController {
@Implementation
public boolean isAvailable() {
diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java
new file mode 100644
index 0000000..71766c3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settingslib.R;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {SettingsShadowSystemProperties.class})
+public class LogdSizePreferenceControllerV2Test {
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private ListPreference mPreference;
+
+ /**
+ * List Values
+ *
+ * 0: off
+ * 1: 64k
+ * 2: 256k
+ * 3: 1M
+ * 4: 4M
+ * 5: 16M
+ */
+ private String[] mListValues;
+ private String[] mListSummaries;
+ private Context mContext;
+ private LogdSizePreferenceControllerV2 mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mListValues = mContext.getResources().getStringArray(R.array.select_logd_size_values);
+ mListSummaries = mContext.getResources().getStringArray(R.array.select_logd_size_summaries);
+ mController = new LogdSizePreferenceControllerV2(mContext);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @After
+ public void teardown() {
+ SettingsShadowSystemProperties.clear();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreferenceToDefault() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mPreference).setValue(mListValues[2]);
+ verify(mPreference).setSummary(mListSummaries[2]);
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
new file mode 100644
index 0000000..8b96af0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.hardware.usb.UsbManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SelectUsbConfigPreferenceControllerTest {
+
+ @Mock
+ private ListPreference mPreference;
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private UsbManager mUsbManager;
+
+ private Context mContext;
+ private Lifecycle mLifecycle;
+ private SelectUsbConfigPreferenceController mController;
+
+ /**
+ * Array Values Key
+ *
+ * 0: Charging
+ * 1: MTP
+ * 2: PTP
+ * 3: RNDIS
+ * 4: Audio Source
+ * 5: MIDI
+ */
+ private String[] mValues;
+ private String[] mSummaries;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mLifecycle = new Lifecycle();
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mUsbManager).when(mContext).getSystemService(Context.USB_SERVICE);
+ mValues = mContext.getResources().getStringArray(R.array.usb_configuration_values);
+ mSummaries = mContext.getResources().getStringArray(R.array.usb_configuration_titles);
+ mController = spy(new SelectUsbConfigPreferenceController(mContext, mLifecycle));
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+
+ }
+
+ @Test
+ public void onPreferenceChange_setCharging_shouldEnableCharging() {
+ when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);
+ doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());
+ mController.onPreferenceChange(mPreference, mValues[0]);
+
+ verify(mController).setCurrentFunction(mValues[0], false /* usb data unlock */);
+ }
+
+ @Test
+ public void onPreferenceChange_setMtp_shouldEnableMtp() {
+ when(mUsbManager.isFunctionEnabled(mValues[1])).thenReturn(true);
+ doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());
+ mController.onPreferenceChange(mPreference, mValues[1]);
+
+ verify(mController).setCurrentFunction(mValues[1], true /* usb data unlock */);
+ }
+
+ @Test
+ public void updateState_chargingEnabled_shouldSetPreferenceToCharging() {
+ when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setValue(mValues[0]);
+ verify(mPreference).setSummary(mSummaries[0]);
+ }
+
+ @Test
+ public void updateState_RndisEnabled_shouldEnableRndis() {
+ when(mUsbManager.isFunctionEnabled(mValues[3])).thenReturn(true);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setValue(mValues[3]);
+ verify(mPreference).setSummary(mSummaries[3]);
+ }
+
+ @Test
+ public void updateState_noValueSet_shouldEnableChargingAsDefault() {
+ mController.updateState(mPreference);
+
+ verify(mPreference).setValue(mValues[0]);
+ verify(mPreference).setSummary(mSummaries[0]);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void onCreate_shouldRegisterReceiver() {
+ mLifecycle.onCreate(null /* bundle */);
+
+ verify(mContext).registerReceiver(any(), any());
+ }
+
+ @Test
+ public void onDestroy_shouldUnregisterReceiver() {
+ doNothing().when(mContext).unregisterReceiver(any());
+ mLifecycle.onDestroy();
+
+ verify(mContext).unregisterReceiver(any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java
index faeda87..4f9540f 100644
--- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java
@@ -22,7 +22,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.graphics.drawable.Drawable;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -56,8 +55,6 @@
private Preference mPreference;
@Mock
private DefaultAppInfo mAppInfo;
- @Mock
- private Drawable mDrawable;
private Context mContext;
private WebViewAppPreferenceControllerV2 mController;
@@ -80,24 +77,20 @@
public void updateState_hasAppLabel_shouldSetAppLabelAndIcon() {
final String appLabel = "SomeRandomAppLabel!!!";
when(mAppInfo.loadLabel()).thenReturn(appLabel);
- when(mAppInfo.loadIcon()).thenReturn(mDrawable);
mController.updateState(mPreference);
verify(mPreference).setSummary(appLabel);
- verify(mPreference).setIcon(mDrawable);
}
@Test
public void updateState_noAppLabel_shouldSetAppDefaultLabelAndNullIcon() {
final String appLabel = null;
when(mAppInfo.loadLabel()).thenReturn(appLabel);
- when(mAppInfo.loadIcon()).thenReturn(mDrawable);
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.app_list_preference_none);
- verify(mPreference).setIcon(null);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
index 9bbc9bd..46db6b3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -41,11 +41,13 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyDetectionPolicyTest {
- private static final String ANOMALY_DETECTION_CONSTANTS_VALUE = "anomaly_detection_enabled=true"
+ private static final String ANOMALY_DETECTION_CONSTANTS_VALUE =
+ "anomaly_detection_enabled=true"
+ ",wakelock_enabled=false"
+ ",wakelock_threshold=3000"
+ ",wakeup_alarm_enabled=true"
+ ",wakeup_alarm_threshold=100"
+ + ",wakeup_blacklisted_tags=tag1:tag2:with%2Ccomma:with%3Acolon"
+ ",bluetooth_scan_enabled=true"
+ ",bluetooth_scan_threshold=2000";
private Context mContext;
@@ -59,7 +61,7 @@
}
@Test
- public void testInit_containsDataFromSettings() {
+ public void testInit_usesConfigValues() {
AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
@@ -67,12 +69,14 @@
assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(3000);
assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();
assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(100);
+ assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags)
+ .containsExactly("tag1", "tag2", "with,comma", "with:colon");
assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(2000);
}
@Test
- public void testInit_containsDefaultData() {
+ public void testInit_defaultValues() {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
// Mock it to avoid noSuchMethodError
@@ -82,18 +86,19 @@
AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
mKeyValueListParserWrapper);
- assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
- assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isTrue();
+ assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isFalse();
+ assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);
assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse();
- assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);
- assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
+ assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(10);
+ assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags).isNull();
+ assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();
assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
30 * DateUtils.MINUTE_IN_MILLIS);
}
@Test
- public void testIsAnomalyDetectorEnabled() {
+ public void testIsAnomalyDetectorEnabled_usesConfigValues() {
AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
@@ -104,18 +109,37 @@
Anomaly.AnomalyType.BLUETOOTH_SCAN)).isTrue();
}
+ @Test
+ public void testIsAnomalyDetectorEnabled_usesDefaultValues() {
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
+ // Mock it to avoid noSuchMethodError
+ doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
+ doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
+
+ AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
+ mKeyValueListParserWrapper);
+
+ assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+ Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+ assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+ Anomaly.AnomalyType.WAKEUP_ALARM)).isFalse();
+ assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+ Anomaly.AnomalyType.BLUETOOTH_SCAN)).isFalse();
+ }
+
private AnomalyDetectionPolicy createAnomalyPolicyWithConfig() {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.ANOMALY_DETECTION_CONSTANTS, ANOMALY_DETECTION_CONSTANTS_VALUE);
// Mock it to avoid noSuchMethodError
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, true);
+ AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, false);
doReturn(false).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, true);
+ AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, false);
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
+ AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
index 55be734..13a5ab8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
@@ -30,6 +30,7 @@
import android.os.Build;
import android.text.format.DateUtils;
import android.util.ArrayMap;
+import android.util.ArraySet;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -52,6 +53,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -69,6 +71,7 @@
1 * DateUtils.HOUR_IN_MILLIS + 10 * DateUtils.MINUTE_IN_MILLIS;
private static final int ANOMALY_WAKEUP_COUNT = 500;
private static final int NORMAL_WAKEUP_COUNT = 61;
+ private static final int BLACKLISTED_WAKEUP_COUNT = 37;
private static final int ANOMALY_WAKEUP_FREQUENCY = 428; // count per hour
@Mock
private BatteryStatsHelper mBatteryStatsHelper;
@@ -87,12 +90,12 @@
@Mock
private BatteryUtils mBatteryUtils;
@Mock
- private ApplicationInfo mApplicationInfo;
- @Mock
private BatteryStats.Uid.Pkg mPkg;
@Mock
private BatteryStats.Counter mCounter;
@Mock
+ private BatteryStats.Counter mCounter2;
+ @Mock
private AnomalyDetectionPolicy mPolicy;
@Mock
private AnomalyAction mAnomalyAction;
@@ -111,6 +114,9 @@
mContext = spy(RuntimeEnvironment.application);
ReflectionHelpers.setField(mPolicy, "wakeupAlarmThreshold", 60);
+ final Set<String> blacklistedTags = new ArraySet<>();
+ blacklistedTags.add("blacklistedTag");
+ ReflectionHelpers.setField(mPolicy, "wakeupBlacklistedTags", blacklistedTags);
doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
doReturn(RUNNING_TIME_MS).when(mBatteryUtils).calculateRunningTimeBasedOnStatsType(any(),
@@ -207,4 +213,20 @@
assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
2 * NORMAL_WAKEUP_COUNT);
}
+
+ @Test
+ public void testGetWakeupAlarmCountFromUid_filterOutBlacklistedTags() {
+ final ArrayMap<String, BatteryStats.Uid.Pkg> packageStats = new ArrayMap<>();
+ final ArrayMap<String, BatteryStats.Counter> alarms = new ArrayMap<>();
+ doReturn(alarms).when(mPkg).getWakeupAlarmStats();
+ doReturn(NORMAL_WAKEUP_COUNT).when(mCounter).getCountLocked(anyInt());
+ doReturn(BLACKLISTED_WAKEUP_COUNT).when(mCounter2).getCountLocked(anyInt());
+ doReturn(packageStats).when(mAnomalyUid).getPackageStats();
+ packageStats.put("", mPkg);
+ alarms.put("allowedTag", mCounter);
+ alarms.put("blacklistedTag", mCounter2);
+
+ assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
+ NORMAL_WAKEUP_COUNT);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
new file mode 100644
index 0000000..f8e5775
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.notification;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.Intent;
+import android.os.UserManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowToast;
+import org.robolectric.RuntimeEnvironment;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.RuntimeEnvironment.application;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ })
+public class ZenModeScheduleRuleSettingsTest {
+
+ @Mock
+ private Activity mActivity;
+
+ @Mock
+ private Intent mIntent;
+
+ @Mock
+ private UserManager mUserManager;
+
+ private TestFragment mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mFragment = spy(new TestFragment());
+ mFragment.onAttach(application);
+
+ doReturn(mActivity).when(mFragment).getActivity();
+
+ Resources res = application.getResources();
+
+ doReturn(res).when(mFragment).getResources();
+ when(mActivity.getTheme()).thenReturn(res.newTheme());
+ when(mActivity.getIntent()).thenReturn(mIntent);
+ when(mActivity.getResources()).thenReturn(res);
+ when(mFragment.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ }
+
+ @Test
+ public void onCreate_noRuleId_shouldToastAndFinishAndNoCrash() {
+ final Context ctx = application.getApplicationContext();
+ final String expected = ctx.getResources().getString(R.string.zen_mode_rule_not_found_text);
+
+ mFragment.onCreate(null);
+
+ // verify the toast
+ assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(expected);
+
+ // verify the finish
+ verify(mActivity).finish();
+
+ //shoud not crash
+ }
+
+ public static class TestFragment extends ZenModeScheduleRuleSettings {
+
+ @Override
+ protected Object getSystemService(final String name) {
+ return null;
+ }
+
+ @Override
+ protected void maybeRefreshRules(boolean success, boolean fireChanged) {
+ //do nothing
+ }
+ }
+
+}