Merge "Display a list of feature flags"

commit: ae084747fc7c5f944168eab514ea1523c98546f4 [log] [tgz]
author: Fan Zhang <zhfan@google.com> Wed Oct 04 20:11:36 2017 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Oct 04 20:11:36 2017 +0000
tree: a8129170e5da1fa82c05703ce56eefd8bb710c34
parent: 1f02ca767330c39119c91b103ca07771cc9fd7eb [diff]
parent: 2d1ab9a193f2a4b681d0ab20d0dbfbaf644df00e [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 689815f..39b14a3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Stel \'n skermslot"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel \'n wagwoord vir sekuriteit"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wagwoord vir vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon vir vingerafdruk"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Stel wagwoord om vingerafdruk te gebruik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Stel patroon om vingerafdruk te gebruik"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel \'n PIN vir sekuriteit"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Stel \'n PIN om vingerafdruk te gebruik"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel \'n patroon vir sekuriteit"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Voer jou wagwoord weer in"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konnektiwiteitmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konnektiwiteitmonitor sal loglêers insamel wanneer dit \'n konnektiwiteitprobleem bespeur en \'n aanporkennisgewing na die gebruiker stuur om \'n fout aan te meld"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Laat die toestel herselflaai om konnektiwiteitmonitorverandering toe te pas"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera-HAL-HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Herselflaai toestel om Kamera-HAL-HDR+-verandering toe te pas"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameralasersensor"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b728c61..6e192c6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"የጣት አሻራን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</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_pin_message" msgid="1875420718677275646">"ለደህንነት አንድ ፒን ያቀናብሩ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ካሜራ HAL ኤችዲአር+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"የካሜራ HAL ኤችዲአር+ ለውጥን ለመተግባር መሣሪያውን ዳግም ያስነሱት"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"የካሜራ ሌዘር ዳሳሽ"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1f32ae6..ffa30fd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -1522,11 +1522,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"لاستخدام بصمة الإصبع، عيّن كلمة مرور"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"لاستخدام بصمة الإصبع، يُرجى رسم نقش من ابتكارك"</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_pin_message" msgid="1875420718677275646">"يجب تعيين رقم تعريف شخصي لأغراض أمنية"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3574,12 +3573,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ألوان هادئة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان عرض هادئة"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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">"Camera HAL HDR+‎"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏لتطبيق تغيير Camera HAL HDR+‎، يمكنك إعادة تشغيل الجهاز"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"مُستشعِر الليزر في الكاميرا"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index dfeeda3..1b3ace9 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yüklənir…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Təhlükəsizlik üçün parol ayarlayın"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmaq izi üçün parol seçin"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmaq izi üçün nümunə seçin"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Barmaq izi üçün parol ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Barmaq izi üçün nümunə ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Təhlükəsizlik üçün PIN ayarlayın"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Barmaq izi istifadəsi üçün PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Təhlükəsizlik üçün nümunə ayarlayın"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolu yenidən daxil edin."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Modeli təsdiq edin"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı Monitoru"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Bağlantı Monitoru bağlantı problemi aşkarladıqda qeydləri əldə edərək istifadəçiyə baq bildirməsi üçün bildiriş göndərəcək"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı monitoruna dəyişiklik etmək üçün cihazı yenidən başladın"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ dəyişikliyi əlavə etmək üçün cihazı yenidən işə salın"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensoru"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f3031d0..0040ca9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -1483,11 +1483,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitava se…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Podesite zaključavanje ekrana"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Podesite lozinku iz bezbednosnih razloga"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Podesite lozinku da biste koristili otisak"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Podesite šablon da biste koristili otisak"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Podesite lozinku radi korišćenja otiska"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Podesite šablon radi korišćenja otiska"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Podesite PIN iz bezbednosnih razloga"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Podesite PIN da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Podesite šablon iz bezbednosnih razloga"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite šablon"</string>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor će prikupljati evidenciju kada otkrije problem sa povezivanjem i zatražiće od korisnika da prijavi grešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Restartujte uređaj da biste primenili promenu ConnectivityMonitor-a"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primenili promenu na kameru HAL HDR+, restartujte uređaj"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor lasera Kamere"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ace3651..5658004 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -1497,11 +1497,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Перш чым карыстацца адбіткам пальца, задайце пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Спачатку задайце ўзор"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Для большай бяспекі задайце PIN-код"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Увядзіце пароль яшчэ раз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Пацвердзіце ўзор"</string>
@@ -3490,12 +3491,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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">"HDR+ для камеры HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Каб уключыць HDR+ для камеры HAL, перазагрузіце прыладу"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерны датчык камеры"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 406dded..9f90046 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте парола, за да ползвате отпечатък"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте фигура, за да ползвате отпечатък"</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_pin_message" msgid="1875420718677275646">"От съображения за сигурност задайте ПИН код"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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">"HDR+ с Camera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"За да приложите промяната, свързана с режима „HDR+ с Camera HAL“, рестартирайте устройството"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор на лазера на камерата"</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 4909494..f104b37 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -1249,7 +1249,7 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> এর মধ্যে থাকা অ্যাপ্লিকেশন, ছবি বা ডেটা ব্যবহার করার জন্য, এটিকে পুনরায় ঢোকান। \n\nঅনুরূপভাবে, ডিভাইস উপলব্ধ না থাকলে আপনি এই সঞ্চয়স্থান মনে নেই বেছে নিতে পারেন। \n\nআপনি যদি মনে নেই বাছেন, তবে ডিভাইসের মধ্যে থাকা সমস্ত ডেটা চিরতরে হারিয়ে যাবে। \n\nআপনি পরে অ্যাপটিকে পুনরায় ইনস্টল করতে পারেন, তবে এই ডিভাইসটিতে যে ডেটা সঞ্চিত আছে তা হারিয়ে যাবে।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ্লিকেশানগুলি"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"ছবি"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"অডিও"</string>
@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পাসওয়ার্ড সেট করুন"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"আঙ্গুলের ছাপ ব্যবহার করার জন্য প্যাটার্ন সেট করুন"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"আপনার পাসওয়ার্ডটি আবার লিখুন"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"আপনার প্যাটার্ন নিশ্চিত করুন"</string>
@@ -1699,7 +1700,7 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"ডিভাইস মেমরি"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"অ্যাপ্লিকেশানের RAM ব্যবহার"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"সিস্টেম"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ্লিকেশানগুলি"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"খালি"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ব্যবহৃত"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"ক্যাসে রাখা হয়েছে"</string>
@@ -2037,7 +2038,7 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"বিবিধ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"নির্ধারিত থেকে বেশী"</string>
-    <string name="power_apps" msgid="2043554781293951327">"অ্যাপগুলি"</string>
+    <string name="power_apps" msgid="2043554781293951327">"অ্যাপ"</string>
     <string name="power_service" msgid="1599661212370831780">"পরিষেবাগুলি"</string>
     <string name="power_system" msgid="8290455327965307383">"সিস্টেম"</string>
     <string name="power_user" msgid="3706143225319881667">"অন্যান্য ব্যবহারকারী"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"রঙের পরিবর্তন প্রয়োগ করতে, স্ক্রীন বন্ধ করুন"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-bs/strings.xml b/res/values-bs/strings.xml
index aa93df2..30ccc9e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -1483,11 +1483,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Postavite zaključavanje ekrana"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Postavite lozinku radi sigurnosti"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Da koristite otisak prsta, postavite lozinku"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</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>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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_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>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Nadzor povezivanja"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Nadzor povezivanja će prikupiti zapisnike kada otkrije problem sa povezivanjem i obavijestiti korisnika da prijavi grešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da primijenite promjenu na nadzoru povezivanja, ponovo pokrenite uređaj"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da primijenite promjenu za Kamera HAL HDR+, ponovo pokrenite uređaj"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor kamere"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b8124c8..09b1877 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Defineix un bloqueig de pantalla"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motius de seguretat, cal que defineixis una contrasenya"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defineix una contrasenya"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defineix un patró"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Defineix una contrasenya"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Defineix un patró"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motius de seguretat, cal que defineixis un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Defineix un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per motius de seguretat, cal que defineixis un patró"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Torna a introduir la contrasenya"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
@@ -2869,7 +2868,7 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Configuració avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Permet els punts de notificació"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de connectivitat"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Quan el monitor de connectivitat detecta un problema, recopila registres i mostra una notificació a l\'usuari perquè informi de l\'error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Per aplicar canvis al monitor de connectivitat, reinicia el dispositiu"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ a HAL de la càmera"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per aplicar els canvis de HDR+ de HAL de la càmera, reinicia el dispositiu"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor del làser de la càmera"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ab43295..1e1b36e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -1496,11 +1496,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavení zámku obrazovky"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostních důvodů nastavte heslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisk vyžaduje nastavení hesla"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisk vyžaduje nastavení gesta"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Otisk vyžaduje nastavení hesla"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Otisk vyžaduje nastavení gesta"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostních důvodů nastavte PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Otisk vyžaduje nastavení PINu"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostních důvodů nastavte gesto"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znovu zadejte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte své gesto"</string>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Služba ConnectivityMonitor při problému s připojením vygeneruje protokoly a zobrazí uživateli oznámení s výzvou k nahlášení chyby"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Chcete-li použít změnu sledování připojení, restartujte zařízení"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparát HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Chcete-li použít změnu fotoaparátu HAL HDR+, restartujte zařízení"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový senzor fotoaparátu"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b89f13d..fe02c0d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Konfigurer en skærmlås"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Konfigurer en adgangskode af hensyn til sikkerheden"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angiv adgangskode for at bruge fingeraftryk"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angiv mønster for at bruge fingeraftryk"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Angiv alternativ metode til fingeraftryk"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Angiv alternativ metode til fingeraftryk"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Konfigurer en pinkode af hensyn til sikkerheden"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Angiv pinkode for at bruge fingeraftryk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angiv et mønster af hensyn til sikkerheden"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angiv din adgangskode igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Overvågning af forbindelse"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor indsamler logfiler, når der registreres et forbindelseproblem, og sender brugeren en underretning for at bede vedkommende om at indsende en fejlrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Genstart enheden for at anvende ændringen i forbindelse med overvågning af forbindelse"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Genstart enheden for at anvende ændringen i forbindelse med Camera HAL HDR+"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 911043a..510dda5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wird geladen..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Displaysperre einrichten"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Richte aus Sicherheitsgründen ein Passwort ein"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Passwort festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Muster festlegen, um Fingerabdruck zu verwenden"</string>
+    <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>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN festlegen, um Fingerabdruck zu verwenden"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mit Connectivity Monitor werden Protokolle erfasst, wenn ein Verbindungsproblem entdeckt wird. Nutzer werden dazu aufgefordert, den Programmfehler zu melden."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Gerät neu starten, damit die Änderungen bei Connectivity Monitor wirksam werden"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Gerät neu starten, damit die Änderungen bei Kamera HAL HDR+ wirksam werden"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera-Lasersensor"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cf9a47d..dcd7122 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Για χρήση δακτ. αποτ. ορίστε κωδ. πρόσβ."</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Για χρήση δακτ. αποτ. ορίστε μοτίβο"</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_pin_message" msgid="1875420718677275646">"Για λόγους ασφαλείας, ορίστε έναν αριθμό PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Για χρήση δακτ. αποτ. ορίστε PIN"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Για να εφαρμόσετε μια αλλαγή στο χρώμα, απενεργοποιήστε την οθόνη"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL κάμερας"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Για να πραγματοποιήσετε αλλαγές στο HDR+ HAL κάμερας, επανεκκινήστε τη συσκευή"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Αισθητήρας λέιζερ κάμερας"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6a619ba..e0aba19 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8feca7f..e00c748 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6a619ba..e0aba19 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6a619ba..e0aba19 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>

diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 0936c6f..dc06c8b 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml

@@ -1469,11 +1469,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎Loading…‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎Set a screen lock‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎For security, set a password‎‏‎‎‏‎"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎To use fingerprint, set password‎‏‎‎‏‎"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎To use fingerprint, set pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎To use fingerprint, set a password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎To use fingerprint, set a pattern‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎For security, set a PIN‎‏‎‎‏‎"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎To use fingerprint, set a PIN‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎For security, set a pattern‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎Re-enter your password‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎Confirm your pattern‎‏‎‎‏‎"</string>
@@ -3401,12 +3400,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎Cool color temperature‎‏‎‎‏‎"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Use cooler display colors‎‏‎‎‏‎"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎To apply color change, turn off screen‎‏‎‎‏‎"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎Connectivity Monitor‎‏‎‎‏‎"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug‎‏‎‎‏‎"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎To apply connectivity monitor change, reboot device‎‏‎‎‏‎"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎Camera HAL HDR+‎‏‎‎‏‎"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎To apply Camera HAL HDR+ change, reboot device‎‏‎‎‏‎"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎Camera Laser Sensor‎‏‎‎‏‎"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 175093d..1333285 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece un bloqueo de pantalla"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de seguridad, establece una contraseña"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Configura tu contraseña"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Configura el patrón"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Crea una contraseña para usar la huella"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar la huella, configura un patrón"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de seguridad, establece un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar la huella, configura un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por razones de seguridad, configura un patrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a ingresar tu contraseña"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
@@ -3400,12 +3399,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"El monitor de conectividad recopilará los registros si detecta un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio del monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0b22e63..0c060e4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece el bloqueo de pantalla"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por seguridad, establece una contraseña"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar la huella, añade una contraseña"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar huellas, añade un patrón"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar la huella, añade contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar la huella, añade un patrón"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por seguridad, establece un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para utilizar la huella, añade un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por seguridad, establece un patrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a introducir tu contraseña"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recopilará los registros al detectar un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio al monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b7cc25f..59770c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laadimine ..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekraaniluku seadistamine"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Turvalisuse huvides määrake parool"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sõrmejälje kasutamiseks määrake parool"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sõrmejälje kasutamiseks määrake muster"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Sõrmejälje kasutamiseks määrake parool"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Sõrmejälje kasutamiseks määrake muster"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Turvalisuse huvides määrake PIN-kood"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Turvalisuse huvides määrake muster"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sisestage oma parool uuesti"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Mustri kinnitamine"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Ühenduvusmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ühenduvusmonitor kogub ühenduvusprobleemide korral logisid ja esitab kasutajale märguande veaaruande esitamiseks"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ühenduvusmonitori muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kaamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kaamera HAL HDR+ muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kaamera laserandur"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8e4da92..aaf86a0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Kargatzen…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ezarri pantailaren blokeo bat"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Babestuta egoteko, ezarri pasahitz bat"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Hatz-marka erabiltzeko, ezarri eredua"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Hatz-marka erabiltzeko, ezarri eredua"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Babestuta egoteko, ezarri PIN bat"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Segurtasuna bermatzeko, zehaztu eredua"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Idatzi berriro pasahitza"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Berretsi eredua"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konexio-kontrolatzailea"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konexio-kontrolatzaileak hautematen dituen konexio-arazoak erregistratuko ditu eta jakinarazpenak erakutsio dizkio erabiltzaileari akatsen berri eman dezan"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Konexio-kontrolatzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameraren HAL HDR+ modua"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ modura aldatzeko, berrabiarazi gailua"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraren laser-sentsorea"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 069db09..8eeee5a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"تنظیم گذرواژه برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"تنظیم الگو برای استفاده از اثر انگشت"</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_pin_message" msgid="1875420718677275646">"برای حفظ امنیت، پین تنظیم کنید"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"برای اعمال تغییر رنگ، صفحه را خاموش کنید"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="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-fi/strings.xml b/res/values-fi/strings.xml
index 608b9db..2b104c5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladataan…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Näytön lukituksen käyttöönotto"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Aseta salasana suojauksen parantamiseksi."</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sormenjälki: aseta salasana"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sormenjälki: aseta kuvio"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Aseta PIN-koodi sormenjälkeä varten"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Aseta kuvio sormenjälkeä varten"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Aseta PIN-koodi suojauksen parantamiseksi."</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Aseta PIN-koodi sormenjälkeä varten"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Aseta kuvio suojauksen parantamiseksi."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Anna salasana uudelleen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Yhteysseuranta"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Yhteysseuranta kerää lokitietoja yhteysvirheistä ja kehottaa käyttäjää tekemään virheilmoituksen."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Käynnistä laite uudelleen, jotta yhteysseurannan muutokset astuvat voimaan."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameran HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Käynnistä laite uudelleen, niin kameran HAL HDR+ ‑muutos astuu voimaan."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameran laseranturi"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0ec81af..c731c4f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -1470,15 +1470,14 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement en cours..."</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 plus de sécurité, définissez un mot de passe"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour util. empr. digit., config. m. de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser empreinte digitale, configurer schéma"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pour util. empr. digit., défin. m. de p."</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pour util. empr. digit., défin. un motif"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour plus de sécurité, définissez un NIP"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pour util. empr. digit., config. un NIP"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour plus de sécurité, définissez un schéma de verrouillage"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Entrez de nouveau votre mot de passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Entrez de nouveau votre NIP"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Entrer de nouveau votre NIP"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les NIP ne correspondent pas."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mode de déverrouillage"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème lié à la connectivité, puis invite l\'utilisateur à soumettre un bogue."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer les changements de ConnectivityMonitor, redémarrez l\'appareil"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Mode HAL HDR+ de l\'appareil photo"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour appliquer les changements HAL HDR+ de l\'appareil photo, redémarrez l\'appareil"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur laser de l\'appareil photo"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cdac427..c164a62 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour utiliser votre empreinte, définissez un mot de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser votre empreinte, définissez un schéma"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour des raisons de sécurité, définissez un code"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Saisissez de nouveau votre mot de passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème de connectivité, puis invite l\'utilisateur à créer un bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer la modification effectuée par ConnectivityMonitor, redémarrez l\'appareil"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fonction HDR+ HAL de la caméra"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour activer la fonction HDR+ dans l\'HAL de la caméra, redémarrez l\'appareil"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur du laser de l\'appareil photo"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5e92054..0f7156f 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Define un bloqueo de pantalla"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por cuestións de seguranza, configura un contrasinal"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Impresión dixital: contrasinal"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Impresión dixital: padrón"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Impresión dixital: define un contrasinal"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Impresión dixital: define un padrón"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por cuestións de seguranza, configura un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impr. dixital, define un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por cuestións de seguranza, define un padrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Volve introducir o teu contrasinal"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma o teu padrón"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade recompilará rexistros cando detecte un problema e enviará unha notificación ao usuario para solicitarlle que informe dun erro"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar o cambio do monitor de conectividade, reinicia o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar o cambio da cámara HAL HDR+, reinicia o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser da cámara"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index fb06528..6919115 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ફિંગરપ્રિન્ટ વાપરવા પાસવર્ડ સેટ કરો"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ફિંગરપ્રિન્ટ વાપરવા પૅટર્ન સેટ કરો"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"સુરક્ષા માટે, પિન સેટ કરો"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"રંગ ફેરફાર લાગુ કરવા માટે, સ્ક્રીન બંધ કરો"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitorને કનેક્ટિવિટીમાં કોઈ સમસ્યા મળશે ત્યારે તે લૉગ એકત્રિત કરશે અને વપરાશકર્તાને ખામીની જાણ કરવાની નોટિફિકેશનનો સંકેત આપશે"</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-hi/strings.xml b/res/values-hi/strings.xml
index d180517..e82a014 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फ़िंगरप्रिंट का उपयोग करने के लिए, पासवर्ड सेट करें"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फ़िंगरप्रिंट का उपयोग करने के लिए, पैटर्न सेट करें"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षा के लिए, पिन सेट करें"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"पासवर्ड फिर से दर्ज करें"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने पैटर्न की पुष्टि करें"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"डिसप्ले में हलके रंगों का इस्तेमाल करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-hr/strings.xml b/res/values-hr/strings.xml
index 3adb3bc..e792cb0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -1483,11 +1483,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Postavljanje zaključavanja zaslona"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Radi sigurnosti postavite zaporku"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisak prsta zahtijeva zaporku"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisak prsta zahtijeva uzorak"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Otisak prsta zahtijeva zaporku"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Otisak prsta zahtijeva uzorak"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Radi sigurnosti postavite PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Za upotrebu otiska prsta postavite PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Radi sigurnosti postavite uzorak"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovni unos zaporke"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor povezivanja"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Monitor povezivanja prikupljat će zapisnike kada otkrije problem s povezivanjem i obavijestiti korisnika da prijavi programsku pogrešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da biste primijenili promjenu koju je izvršio monitor povezivanja, ponovo pokrenite uređaj."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ fotoaparata"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primijenili promjenu HAL HDR+ fotoaparata, ponovo pokrenite uređaj"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor fotoaparata"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2190437..74fa10f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Betöltés…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Képernyőzár beállítása"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"A biztonság érdekében állítson be jelszót"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Jelszó az ujjlenyomathoz"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Minta az ujjlenyomathoz"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Az ujjlenyomathoz állítson be jelszót"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Az ujjlenyomathoz állítson be mintát"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"A biztonság érdekében állítson be PIN-kódot"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Ujjlenyomathoz állítsa be a PIN-kódot"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"A biztonság érdekében állítson be mintát"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Adja meg újra a jelszót"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
@@ -3404,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kapcsolódásfigyelő"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"A Kapcsolódásfigyelő begyűjti a naplókat, amikor kapcsolódási problémát észlel, és értesítésben javasolja a felhasználónak a hiba jelentését"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"A kapcsolódásfigyelő módosításának engedélyezéséhez indítsa újra az eszközt"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"A Kamera HAL HDR+ módosításához indítsa újra az eszközt"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"A kamera lézeres érzékelője"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9f39c0e..f224b0b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Մատնահետքն օգտագործելու համար տեղադրեք գաղտնաբառ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Մատնահետքն օգտագործելու համար ստեղծեք նախշ"</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_pin_message" msgid="1875420718677275646">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք PIN կոդ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Մատնահետքն օգտագործելու համար ընտրեք PIN"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Գույնի փոփոխությունը կիրառելու համար անջատեք էկրանը"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Կապի հետ կապված խնդիրներ հայտնաբերելու դեպքում ConnectivityMonitor-ը կհավաքի մատյանները և օգտվողին կհուշի վրիպակ գրանցելու անհրաժեշտության մասին"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</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-in/strings.xml b/res/values-in/strings.xml
index b9cc905..aa28739 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -1059,14 +1059,14 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalisasi layar Anda"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Screen saver"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi daya atau dipasang ke dok"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi baterai atau dipasang ke dok"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Keduanya"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Tidak pernah"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Untuk mengontrol yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, aktifkan screen saver."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ketika memulai"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Waktu mulai"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver saat ini"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuat…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setel kunci layar"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Untuk keamanan, setel sandi"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Setel sandi guna memakai sidik jari"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Setel pola untuk fitur sidik jari"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Setel sandi untuk menggunakan sidik jari"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Setel pola untuk menggunakan sidik jari"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Untuk keamanan, setel PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Setel PIN untuk memakai sidik jari"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Untuk keamanan, setel pola"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan ulang sandi"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
@@ -2875,13 +2874,13 @@
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cahaya kedip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Di layar kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten notifikasi"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Menyembunyikan konten notifikasi yang sensitif"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten notifikasi yang sensitif"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Jangan tampilkan notifikasi sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifikasi"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Tampilkan semua konten notifikasi kerja"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Sembunyikan konten notifikasi kerja yang sensitif"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan menampilkan notifikasi kerja sama sekali"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan tampilkan notifikasi kerja sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifikasi profil"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Notifikasi"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor Konektivitas"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"MonitorKonektivitas akan mengumpulkan log jika mendeteksi masalah konektivitas, dan mengirimkan notifikasi kepada pengguna untuk melaporkan bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menerapkan perubahan monitor konektivitas, reboot perangkat"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menerapkan perubahan Kamera HAL HDR+, reboot perangkat"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor Laser Kamera"</string>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 11374fa..93604f5 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Hleður…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setja upp skjálás"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Settu upp aðgangsorð til að gæta fyllsta öryggis"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aðgangsorð þarf fyrir fingrafar"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Mynstur þarf fyrir fingrafar"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Stilltu aðgangsorð til að nota fingrafar"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Stilltu mynstur til að nota fingrafar"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Settu upp PIN-númer til að gæta fyllsta öryggis"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Stilltu PIN-númer til að nota fingrafar"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Settu upp mynstur til að gæta fyllsta öryggis"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sláðu aðgangsorðið inn aftur"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Staðfestu mynstrið"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Umsjón tenginga"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Umsjón tenginga safnar annálum þegar hún greinir vandamál með tengingu og birtir notandanum tilkynningu um að senda inn villutilkynningu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Endurræstu tækið til að breyta umsjón tenginga"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Myndavél HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Endurræstu tækið til að virkja breytingu á myndavél HAL HDR+"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Leysigeislaskynjari myndavélar"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8591a2c..d6e1211 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Imposta il blocco schermo"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motivi di sicurezza, imposta una password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Per usare l\'impronta digitale, imposta la password"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Per usare l\'impronta digitale, imposta la sequenza"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Per usare l\'impronta imposta la password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Per usare l\'impronta imposta la sequenza"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motivi di sicurezza, imposta un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Per usare l\'impronta, imposta il PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per sicurezza, imposta una sequenza"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Inserisci di nuovo la password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor raccoglierà log quando rileverà un problema di connettività e invierà una notifica all\'utente per segnalare il bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Riavvia il dispositivo per applicare la modifica a ConnectivityMonitor"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotocamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per applicare la modifica relativa alla Fotocamera HAL HDR+, riavvia il dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensore laser della fotocamera"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b2f5a8d..cbdb563 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -1496,11 +1496,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"כדי להשתמש בטביעת אצבע, הגדר סיסמה"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"לטביעת האצבע נדרש קו ביטול נעילה"</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_pin_message" msgid="1875420718677275646">"לשיפור האבטחה, מומלץ להגדיר קוד גישה"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3490,12 +3489,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"כבה את המסך כדי להחיל שינוי צבע"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‏ConnectivityMonitor יאסוף מידע ביומנים כשיזהה בעית קישוריות וישלח הודעה למשתמש כדי שיוכל להגיש דוח על באג"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‏כדי להחיל את השינוי ב-Connectivity Monitor, יש להפעיל מחדש את המכשיר"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏צילום באיכות +HDR עם HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏כדי להפעיל צילום באיכות +HDR עם HAL, עליך להפעיל את המכשיר מחדש"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"חיישן הלייזר של המצלמה"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2a388a5..fe7ff90 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -642,7 +642,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"電話帳を共有する"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>が連絡先と通話履歴にアクセスしようとしています。"</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>がBluetoothとペア設定しようとしています。接続されると、連絡先や通話履歴にアクセスします。"</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ペアリングされたデバイス"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ペア設定したデバイス"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"使用可能なデバイス"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"利用可能なデバイスがありません"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"接続"</string>
@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"指紋認証にはパスワードが必要です"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"指紋認証にはパターンが必要です"</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_pin_message" msgid="1875420718677275646">"セキュリティを強化するには、PIN を設定してください"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"指紋認証には PIN が必要です"</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>
@@ -3406,12 +3405,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor は、接続の問題が検出されたときにログを収集し、バグを報告するようユーザーに通知を表示します"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor の変更を適用するには、端末を再起動してください"</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-ka/strings.xml b/res/values-ka/strings.xml
index cac2432..9796c6b 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ პაროლი"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"თითის ანაბეჭდისთვის დააყენეთ ნიმუში"</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_pin_message" msgid="1875420718677275646">"უსაფრთხოებისთვის, დააყენეთ PIN-კოდი"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"თითის ანაბეჭდის გამოსაყენებლად, დააყენეთ PIN-კოდი"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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 6079cbc..1742e4e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Құпия сөзді қайта енгізіңіз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Өрнекті растаңыз"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгерісін қолдану үшін экранды өшіріңіз"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor функциясы байланыс ақауын анықтаған кезде журналдарды жинайды және пайдаланушыға қате туралы есеп жіберуді ұсынады"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</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-km/strings.xml b/res/values-km/strings.xml
index e84cfd0..d3470c6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ដើម្បីប្រើប្រាស់ស្នាមម្រាមដៃ សូមកំណត់ពាក្យសម្ងាត់"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បីប្រើស្នាមម្រាមដៃ សូមកំណត់លំនាំ"</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_pin_message" msgid="1875420718677275646">"ដើម្បីទទួលបានសុវត្ថិភាព សូមកំណត់កូដ PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ដើម្បីប្រើស្នាមម្រាមដៃ សូមកំណត់កូដ PIN"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="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 cee2a00..520ccb1 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ಬಣ್ಣದ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಪರದೆ ಆಫ್ ಮಾಡಿ"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-ko/strings.xml b/res/values-ko/strings.xml
index 8663109..2ba7e71 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"비밀번호를 설정하여 지문 사용"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"지문 사용 전 입력할 패턴 설정"</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_pin_message" msgid="1875420718677275646">"보안을 위해 PIN을 설정하세요."</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"지문을 사용하려면 PIN을 설정하세요"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"색상 변경을 적용하려면 화면을 끄세요."</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-ky/strings.xml b/res/values-ky/strings.xml
index 64f5f78..3e6649a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -1469,11 +1469,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Манжа изин колдонуу үчүн сырсөздү жөндөңүз"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Манжа изин колдонуу үчүн графикалык ачкычты жөндөңүз"</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_pin_message" msgid="1875420718677275646">"Коопсуздук үчүн PIN код коюп алыңыз"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</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>
@@ -3405,12 +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>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor туташуу функцияларында көйгөй тапса, анын таржымалын аныктайт жана мүчүлүштүк тууралуу кабарлоо үчүн колдонуучуга эскертме жөнөтөт"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</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-lo/strings.xml b/res/values-lo/strings.xml
index ba299ef..412581e 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</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_pin_message" msgid="1875420718677275646">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດ PIN ໄວ້"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ເພື່ອນຳໃຊ້ການປ່ຽນສີ, ໃຫ້ປິດໜ້າຈໍ"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ຈະເກັບກຳບັນທຶກການເຮັດວຽກຕ່າງໆ ເມື່ອມັນກວດພົບບັນຫາການເຊື່ອມຕໍ່ ແລະ ຈະແຈ້ງເຕືອນໄປໃຫ້ຜູ້ໃຊ້ເພື່ອລາຍງານຂໍ້ຜິດພາດ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ connectivity change, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</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-lt/strings.xml b/res/values-lt/strings.xml
index 8397519..10f3e96 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -1496,11 +1496,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Įkeliama…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrano užrakto nustatymas"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kad užtikrintumėte saugumą, nustatykite slaptažodį"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nust. slapt., kad gal. naud. kont. kodą"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nust. atrak. pieš., kad gal. naud. kont. kodą"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Nust. slapt., kad gal. naud. kont. kodą"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Nust. atr. pieš., kad gal. naud. k. kodą"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kad užtikrintumėte saugumą, nustatykite PIN kodą"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kad užtikrintumėte saugumą, nubrėžkite atrakinimo piešinį"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Įveskite slaptažodį iš naujo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite piešinį"</string>
@@ -3488,12 +3487,9 @@
     <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>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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_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>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Fotoaparato lazerio jutiklis"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9ab058a..722769c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -1483,11 +1483,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Notiek ielāde…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrāna bloķēšanas iestatīšana"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Drošības nolūkos iestatiet paroli."</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parole pirksta nosp. lietošanai"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Kombinācijas iestatīšana"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Parole pirksta nospieduma lietošanai"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Kombinācija pirksta nospied. lietošanai"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Drošības nolūkos iestatiet PIN."</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN iestatīšana pirksta nosp. lietošanai"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Drošības nolūkos iestatiet kombināciju."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Atkārtota paroles ievade"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Apstipriniet kombināciju"</string>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Savienojamības pārraugs"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ja tiks konstatēta savienojuma problēma, savienojamības pārraugs apkopos žurnālus un paziņojumā aicinās lietotāju reģistrēt kļūdu."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Lai lietotu savienojamības pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameras HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Lai piemērotu kameras HAL HDR+ izmaiņas, restartējiet ierīci."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameras lāzera sensors"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6beca6c..81cc00a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Поставете лозинка за отпечаток"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Поставете шема за отпечаток"</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_pin_message" msgid="1875420718677275646">"За безбедност, поставете PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"За да користите отпечаток, поставете PIN"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да се примени промената на бојата, исклучете го екранот"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-ml/strings.xml b/res/values-ml/strings.xml
index d86960c..efa3a6a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാറ്റേൺ സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"സുരക്ഷയ്‌ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-mn/strings.xml b/res/values-mn/strings.xml
index 74f6fe4..3b6ec2f 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Хурууны хээ ашиглахын тулд нууц үг тохируулах"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Хурууны хээ ашиглахын тулд загвар тохируулах"</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_pin_message" msgid="1875420718677275646">"Аюулгүйн үүднээс ПИН тохируулах"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3400,12 +3399,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Өнгөний өөрчлөлтийг оруулахын тулд дэлгэцийг унтраана уу"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="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-mr/strings.xml b/res/values-mr/strings.xml
index 8c33d64..25c80a0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिंट वापरण्यासाठी पासवर्ड सेट करा"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिंट वापरण्यासाठी पॅटर्न सेट करा"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षिततेसाठी पिन सेट करा"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"तुमचा पासवर्ड पुन्‍हा टाका"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"आपल्या नमुन्याची पुष्टी करा"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान डिस्प्ले रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-ms/strings.xml b/res/values-ms/strings.xml
index a930ad4..bb9e419 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ttpkn kta lluan utk gnakan cp jari"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Buat corak utk guna cap jari"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Sebagai langkah keselamatan, tetapkan PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan semula kata laluan anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor akan mengumpulkan log apabila mengesan masalah kesambungan dan memaparkan pemberitahuan kepada pengguna untuk memfailkan pepijat."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menggunakan perubahan connectivity monitor, but semula peranti"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menggunakan perubahan Camera HAL HDR+, but semula peranti"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Penderia Laser Kamera"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index cc169d7..5b8ea1f 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"လက်ဗွေသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"လက်ဗွေသုံးရန် ပုံစံသတ်မှတ်ပါ"</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_pin_message" msgid="1875420718677275646">"လုံခြုံရေးအတွက် ပင်နံပါတ်တစ်ခု သတ်မှတ်ပါ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"အရောင်ပြောင်းလဲမှု ပြုလုပ်ရန်၊ မျက်နှာပြင်ကိုပိတ်ပါ"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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">"Camera လေဆာ အာရုံခံကိရိယာ"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a5fb4c7..a48df4b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laster inn …"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Angi en skjermlås"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Angi et passord for sikkerheten"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angi passord for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angi mønster for å bruke fingeravtrykk"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"For å bruke fingeravtrykk, angi passord"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"For å bruke fingeravtrykk, angi mønster"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Angi en PIN-kode for sikkerheten"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"For å bruke fingeravtrykk, angi PIN-kode"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angi et mønster for sikkerheten"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angi passordet på nytt"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønsteret"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Tilkoblingsmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Tilkoblingsmonitoren loggfører problemer som oppdages med tilkoblingen, og varsler brukeren om å sende inn en feilrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start enheten på nytt for å aktivere endringene i tilkoblingsmonitoren"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start enheten på nytt for å aktivere endringene i Kamera HAL HDR+"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2dd9c66..130e98e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षाका ला‍गि एउटा PIN सेट गर्नुहोस्"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"आफ्नो पासवर्ड पुन: प्रविष्ट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंगको परिवर्तन लागू गर्न स्क्रिन बन्द गर्नुहोस्"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="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-nl/strings.xml b/res/values-nl/strings.xml
index 12c2537..f4962df 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -293,8 +293,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Datagebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met dataservices tijdens roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met dataservices tijdens roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat je je thuisnetwerk hebt verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Er kunnen hoge kosten in rekening worden gebracht."</string>
@@ -385,15 +385,15 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest of als deze wordt gestolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Toch overslaan"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Terug"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"De sensor aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"De sensor bevindt zich aan de achterkant van je telefoon. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustratie met apparaat en locatie van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Verwijderen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"De sensor aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Optillen en opnieuw aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Til op en raak opnieuw aan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Een schermvergrendeling instellen"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel een wachtwoord in voor betere beveiliging"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wachtwoord in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon in voor gebruik van vingerafdruk"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pincode instellen voor vingerafdruk"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Patroon instellen voor vingerafdruk"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel een pincode in voor betere beveiliging"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pincode instellen voor vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel een patroon in voor betere beveiliging"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Geef je wachtwoord opnieuw op"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Je patroon bevestigen"</string>
@@ -2425,8 +2424,8 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de tablet aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de telefoon aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-synchr. uitschakelen?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je gegevens- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je data- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum voor resetten gebruikscyclus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
@@ -2452,8 +2451,8 @@
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Betaalde wifi-netwerken"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Als je betaalde netwerken wilt selecteren, schakel je wifi in."</string>
     <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisch"</string>
-    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Hoog geprijsd"</string>
-    <string name="data_usage_metered_no" msgid="4025232961929071789">"Laag geprijsd"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Betaald"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Niet betaald"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"De door de provider berekende gegevens kunnen afwijken van die van je apparaat."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor verzamelt logboeken wanneer een connectiviteitsprobleem wordt gedetecteerd. De gebruiker krijgt een melding te zien waarin wordt gevraagd of hij een bug wil indienen."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start het apparaat opnieuw op om de wijziging in ConnectivityMonitor toe te passen"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start het apparaat opnieuw op om de wijziging in Camera HAL HDR+ toe te passen"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cameralasersensor"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 92f0aee..225dade 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸਥਾਪਤ ਕਰੋ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ਰੰਗ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-pl/strings.xml b/res/values-pl/strings.xml
index 2dc9f64..126c192 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -1496,11 +1496,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wczytuję..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ustawianie blokady ekranu"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ze względów bezpieczeństwa ustaw hasło"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aby korzystać z odcisku palca, ustaw hasło"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Aby korzystać z odcisku palca, ustaw wzór"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Aby używać odcisku palca, ustaw hasło"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Aby używać odcisku palca, ustaw wzór"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ze względów bezpieczeństwa ustaw kod PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Aby używać odcisku palca, ustaw kod PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ze względów bezpieczeństwa ustaw wzór"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Podaj ponownie hasło"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorowanie łączności"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor zbiera logi po wykryciu problemu z łącznością i powiadamia użytkownika o możliwości zgłoszenia błędu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aby zmiana ustawienia monitorowania łączności zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ aparatu"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Aby zmiana HAL HDR+ aparatu zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Czujnik lasera aparatu"</string>

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 05125aa..56ab7cd 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar sua digital, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar sua digital, defina um padrão"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9dc4e3e..b758374 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de ecrã"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de segurança, defina uma palavra-passe."</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defina palavra-passe para usar impressão digital"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defina padrão para usar impressão digital"</string>
+    <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>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Definir alternativa à impressão digital"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conetividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O Monitor de conetividade recolhe registos quando deteta um problema de conetividade e apresenta uma notificação ao utilizador para comunicar um erro."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar a alteração do monitor de conetividade, reinicie o dispositivo."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Câmara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração da Câmara HAL HDR+, reinicie o dispositivo."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor de laser da câmara"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 05125aa..56ab7cd 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar sua digital, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar sua digital, defina um padrão"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6b771f6..617fea2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -1483,11 +1483,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setați o blocare a ecranului"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Din motive de securitate, setați o parolă"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pentru a utiliza amprenta, setați parola"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pentru a utiliza amprenta, setați modelul"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pentru a utiliza amprenta, setați o parolă"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pentru a utiliza amprenta, setați un model"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Din motive de securitate, setați un cod PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pentru a utiliza amprenta, setați un cod PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Din motive de securitate, setați un model"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduceți parola"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmați modelul"</string>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor colectează jurnalele când detectează o problemă de conectivitate și trimite notificări utilizatorilor să semnaleze o eroare"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pentru a aplica modificarea pentru Connectivity Monitor, reporniți dispozitivul"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera foto HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pentru a aplica modificarea Camerei foto HAL HDR+, reporniți dispozitivul"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor laser al camerei foto"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ddc0b25..08e01ea 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -1496,11 +1496,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте графический ключ"</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_pin_message" msgid="1875420718677275646">"Защитите устройство: задайте PIN-код"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Задайте PIN-код"</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>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Для изменения цветовых настроек нужно отключить экран"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Обнаружив проблему подключения, Connectivity Monitor будет собирать журналы и предлагать пользователю отправить отчет об ошибке"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Чтобы включить Connectivity Monitor, перезагрузите устройство"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL камеры"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Чтобы включить HDR+ HAL камеры, перезагрузите устройство"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерный датчик камеры"</string>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3e95b44..5c63c47 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ඇඟිලි සලකුණ භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</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_pin_message" msgid="1875420718677275646">"ආරක්ෂාව සඳහා, PIN එකක් සකසන්න"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"වර්ණ වෙනස් කිරීම යෙදීමට තිරය ක්‍රියාවිරහිත කරන්න"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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="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-sk/strings.xml b/res/values-sk/strings.xml
index 4f66d33..82a4ec1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -1496,11 +1496,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítava sa…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavenie zámky obrazovky"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostných dôvodov si nastavte heslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostných dôvodov si nastavte kód PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Odtlačok vyžaduje nastavenie kódu PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostných dôvodov si nastavte vzor"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova zadajte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svoj vzor"</string>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorovanie pripojenia"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Keď monitorovanie pripojenia zistí problém s pripojením, bude zhromažďovať denníky a zobrazí používateľovi upozornenie s výzvou na nahlásenie chyby"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ak chcete použiť zmenu monitorovania pripojenia, reštartujte zariadenie"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Režim HAL HDR+ fotoaparátu"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ak chcete uplatniť zmenu režimu HAL HDR+ fotoaparátu, reštartujte zariadenie"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový snímač fotoaparátu"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b4c0fb6..cc16526 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -1496,11 +1496,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Nalaganje …"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavitev zaklepanja zaslona"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Zaradi varnosti nastavite geslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nastavite geslo za prstni odtis"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nastavite vzorec za prstni odtis"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Nastavite geslo za prstni odtis"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Nastavite vzorec za prstni odtis"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Zaradi varnosti nastavite kodo PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Nastavite kodo PIN za prstni odtis"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Nastavite vzorec za večjo varnost"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova vnesite geslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Nadziranje povezljivosti"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Funkcija Nadziranje povezljivosti pridobi dnevnike, ko zazna težavo s povezljivostjo, in uporabnika z obvestilom pozove, naj prijavi napako."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Če želite uveljaviti spremembo nadziranja povezljivosti, znova zaženite napravo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ za HAL kamere"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Če želite uveljaviti spremembo nastavitve HDR+ za HAL kamere, znova zaženite napravo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersko tipalo fotoaparata"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b38bf62..1c3be4e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Për të përdorur gjurmën e gishtit, vendos fjalëkalimin"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Për të përdorur gjurmën e gishtit, vendos motivin"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Për siguri, cakto një kod PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Fut përsëri fjalëkalimin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmo motivin"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitori i lidhshmërisë"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"\"Monitori i lidhshmërisë\" do të mbledhë regjistrat kur të zbulojë një problem të lidhshmërisë dhe do t\'i paraqesë një njoftim përdoruesit që të regjistrojë një defekt në kod"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Për të zbatuar ndryshimin e monitorit të lidhshmërisë, rindiz pajisjen"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ i kamerës"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Për të zbatuar ndryshimin e HAL HDR+ të kamerës, rindiz pajisjen"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensori me laser i kamerës"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7094dd9..52215e1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -1483,11 +1483,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Подесите лозинку да бисте користили отисак"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Подесите шаблон да бисте користили отисак"</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_pin_message" msgid="1875420718677275646">"Подесите PIN из безбедносних разлога"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Подесите PIN да бисте користили отисак"</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>
@@ -3445,12 +3444,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Да бисте применили промену боје, искључите екран"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ће прикупљати евиденцију када открије проблем са повезивањем и затражиће од корисника да пријави грешку"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Рестартујте уређај да бисте применили промену ConnectivityMonitor-а"</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-sv/strings.xml b/res/values-sv/strings.xml
index b0c66f5..fba599f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ange ett skärmlås"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Av säkerhetsskäl måste du ange ett lösenord"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Grafiskt lösenord krävs för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ange lösenord för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ange grafiskt lösenord för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Av säkerhetsskäl måste du ange en pinkod"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pinkod krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Av säkerhetsskäl måste du ange ett grafiskt lösenord"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ange ditt lösenord igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta grafiskt lösenord"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor samlar in loggar när ett anslutningsproblem upptäcks och uppmanar användaren att skicka in en felrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Starta om enheten om du vill tillämpa ändringen för Connectivity Monitor"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ för kamera"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Starta om enheten om du vill tillämpa ändringen HAL HDR+ för kamera"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersensor för kamera"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e647414..77782e5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Weka mbinu ya kufunga skrini"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kwa sababu za usalama, weka nenosiri"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Weka nenosiri ili utumie alama ya kidole"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Weka mchoro ili utumie alama ya kidole"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Weka nenosiri ili utumie alama ya kidole"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Weka mchoro ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kwa sababu za usalama, weka PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Weka PIN ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kwa sababu za usalama, weka mchoro"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Weka nenosiri lako tena"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kichunguzi cha Muunganisho"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Kichunguzi cha Muunganisho hukusanya kumbukumbu wakati kinatambua tatizo la muunganisho na kumwarifu mtumiaji kuwasilisha ripoti ya hitilafu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ili kuweka mabadiliko ya kichunguzi cha muunganisho, washa kifaa tena"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ya Kamera"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ili kutekeleza mabadiliko ya HAL HDR+ ya Kamera, washa kifaa tena"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kitambuzi cha Leza ya Kamera"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d8c6681..ceee70d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"கடவுச்சொல்லை அமைக்கவும்"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"வடிவத்தை அமைக்கவும்"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
@@ -3402,12 +3403,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"வண்ண மாற்றத்தைப் பயன்படுத்த, திரையை முடக்கவும்"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-te/strings.xml b/res/values-te/strings.xml
index c238e9f..8cd36b4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"వేలిముద్ర బ్యాకప్‌ను సెట్ చేయండి"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"వేలిముద్ర బ్యాకప్‌ను సెట్ చేయండి"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"భద్రత కోసం, పిన్‌ను సెట్ చేయండి"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"మీ పాస్‌వర్డ్‌ను మళ్ళీ నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"మీ నమూనాను నిర్ధారించండి"</string>
@@ -3403,12 +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>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-th/strings.xml b/res/values-th/strings.xml
index 74a0cee..918c871 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -40,7 +40,7 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"เปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรร Hangouts วิดีโอแล้ว"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"จัดสรรการโทรผ่าน Wi-Fi แล้ว"</string>
     <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"จัดสรร EAB/Presence แล้ว"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"กำลังส่งของวิทยุเครือข่ายมือถือ"</string>
@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรหัสผ่าน"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่ารูปแบบ"</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_pin_message" msgid="1875420718677275646">"ตั้ง PIN เพื่อความปลอดภัย"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"หากต้องการใช้การเปลี่ยนสี ให้ปิดหน้าจอ"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-tl/strings.xml b/res/values-tl/strings.xml
index 4270b05..1e5a85b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Naglo-load…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Magtakda ng lock ng screen"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Para sa seguridad, magtakda ng password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para magamit ang fingerprint, i-set ang pw"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para magamit ang fingerprint, i-set ang pattern"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Magtakda ng backup ng fingerprint"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Magtakda ng backup ng fingerprint"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Para sa seguridad, magtakda ng PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Magtakda ng backup ng fingerprint"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Para sa seguridad, magtakda ng pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ilagay muli ang iyong password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mangongolekta ang ConnectivityMonitor ng mga log kapag nakatukoy ito ng problema sa koneksyon at magpo-prompt ito ng notification sa user na mag-file ng bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Upang ilapat ang pagbabago sa connectivity monitor, i-reboot ang device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Upang mailapat ang pagbabago sa Camera HAL HDR+, i-reboot ang device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor ng Laser ng Camera"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 71f2b47..ecc76bc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Güvenlik için şifre ayarlayın"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parmak izi için şifre ayarlayın"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Parmak izi için desen ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Parmak izi kullanmak için şifre ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Parmak izi kullanmak için desen ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Güvenlik için PIN ayarlayın"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Parmak izini kullanmak için PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Güvenlik için desen oluşturun"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Şifrenizi yeniden girin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı İzleyiciler:"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor bağlantı sorunu algıladığında günlükleri toplar ve kullanıcılara bir hata bildiriminde bulunmalarını söyler"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı izleyici değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensörü"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 271b549..0646670 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -1496,11 +1496,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Щоб користуватися відбитком пальця, налаштуйте пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Щоб користуватися відбитком пальця, налаштуйте ключ"</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_pin_message" msgid="1875420718677275646">"З міркувань безпеки налаштуйте PIN-код"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Для відбитка пальця потрібен PIN-код"</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>
@@ -3488,12 +3487,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Щоб змінити кольори, вимкніть екран"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Коли Connectivity Monitor виявить проблему зі з’єднанням, він збере журнали та запропонує користувачу повідомити про помилку"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Щоб застосувати зміни в Connectivity Monitor, перезапустіть пристрій"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Режим HDR+ на рівні HAL камери"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Щоб зміна режиму HDR+ на рівні HAL камери почала діяти, перезапустіть пристрій"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерний датчик камери"</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index e4cee43..eb6613c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -1372,26 +1372,26 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیتھرنگ"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیدرنگ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیتھرنگ"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیتھرنگ"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیتھرنگ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیتھرنگ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیدرنگ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیدرنگ"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیدرنگ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیدرنگ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ہاٹ اسپاٹ آن ہے"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیتھرنگ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیدرنگ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیتھرنگ"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیدرنگ"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏USB کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏USB کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیتھرنگ"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیدرنگ"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"بلوٹوتھ کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"بلوٹوتھ کے ذریعے فون کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"اس <xliff:g id="DEVICE_NAME">%1$d</xliff:g> کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کیا جا رہا ہے"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> سے زیادہ آلات کو مربوط نہیں کر سکتے۔"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا ربط ختم کر دیا جائے گا۔"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیتھرنگ کا استعمال کریں۔ قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بھی بنا سکتی ہیں۔"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بھی بنا سکتی ہیں۔"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مدد"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"موبائل نیٹ ورک"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"موبائل پلان"</string>
@@ -1470,11 +1470,12 @@
     <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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"‏سیکیورٹی کیلئے PIN سیٹ کریں"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
+    <!-- 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_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>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"اپنا پاس ورڈ دوبارہ درج کریں"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"اپنے پیٹرن کی توثیق کریں"</string>
@@ -3400,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"رنگ میں تبدیلی لاگو کرنے کیلئے اسکرین آف کریں"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-uz/strings.xml b/res/values-uz/strings.xml
index cc66222..f6682b0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yuklanmoqda…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran qulfini sozlang"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Xavfsizlik uchun parol o‘rnating"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmoq izidan foydalanish uchun parol o‘rnating"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun grafik kalit o‘rnating"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Barmoq izi uchun parollang"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Barmoq izi uchun grafik kalit o‘rnating"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Xavfsizlik uchun PIN kod o‘rnating"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Barmoq izi uchun PIN kod o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Xavfsizlik uchun grafik kalit o‘rnating"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolni qayta kiriting"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Grafik kalitni tasdiqlang"</string>
@@ -3414,12 +3413,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Aloqa nazorati"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Aloqa nazorati aloqa bilan bog‘liq muammolar aniqlansa va foydalanuvchiga xatolikni yuborishi uchun bildirishnoma yuborib, jurnallarni to‘playdi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aloqa nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ qilib o‘zgartirish uchun qurilmani qayta ishga tushiring"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraning lazer sensori"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ae48567..5a39693 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -1470,11 +1470,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Đặt khóa màn hình"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Để bảo mật, hãy đặt mật khẩu"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Để dùng vân tay, đặt mật khẩu"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Để sử dụng vân tay, hãy đặt mật khẩu"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Để sử dụng vân tay, hãy đặt hình mở khóa"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Để bảo mật, hãy đặt mã PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Để sử dụng vân tay, hãy đặt mã PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Vì lý do bảo mật, hãy thiết lập một hình mở khóa"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Nhập lại mật khẩu của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
@@ -1812,7 +1811,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Thời gian sử dụng"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Trợ năng"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt trợ năng"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, điều khiển tương tác"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, tương tác"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cài đặt hiển thị"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng trợ năng này sau trong Cài đặt."</string>
     <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Thay đổi cỡ chữ"</string>
@@ -2031,7 +2030,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Máy ảnh"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"Chờ mạng di động"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mạng di động ở chế độ chờ"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
@@ -2668,7 +2667,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Trình quản lý cuộc gọi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Thông báo khẩn cấp"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Cảnh báo khẩn cấp"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Nhà cung cấp dịch vụ mạng"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Tên điểm truy cập"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Chế độ 4G LTE được tăng cường"</string>
@@ -2980,7 +2979,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nhập tên quy tắc"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Tên quy tắc đã được sử dụng"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm tùy chọn khác"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm quy tắc khác"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Xóa quy tắc"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Chọn loại quy tắc"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Xóa quy tắc \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
@@ -3206,7 +3205,7 @@
     <string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Tối ưu hóa pin không khả dụng"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Không tối ưu hóa pin"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Không áp dụng tối ưu hóa pin. Pin của bạn có thể hết nhanh hơn."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Cho phép ứng dụng luôn chạy trong nền?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Cho phép <xliff:g id="APP_NAME">%1$s</xliff:g> luôn chạy trong nền có thể làm giảm thời lượng pin. \n\nBạn có thể thay đổi điều này sau đó từ Cài đặt &gt; Ứng dụng và thông báo."</string>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Công cụ giám sát kết nối"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Công cụ ConnectivityMonitor sẽ thu thập nhật ký khi phát hiện thấy sự cố kết nối và gửi thông báo khẩn cấp tới người dùng để gửi lỗi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Để áp dụng thay đổi công cụ giám sát kết nối, hãy khởi động lại thiết bị"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Máy ảnh HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Để áp dụng thay đổi Máy ảnh HAL HDR+, hãy khởi động lại thiết bị"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cảm biến laser của máy ảnh"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 801eed9..3bd56c0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"要使用指纹，请设置密码"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"要使用指纹，请设置解锁图案"</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_pin_message" msgid="1875420718677275646">"为了安全起见，请设置 PIN 码"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"要使用指纹，请设置 PIN 码"</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>
@@ -3402,12 +3401,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"要应用颜色更改，请关闭屏幕"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 30f4669..95080ae 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -328,8 +328,8 @@
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> 後"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後隨即啟用 (由<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>維持解鎖狀態時除外)"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (由「<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>」維持解鎖狀態時除外)"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後立即上鎖 (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外)"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>保持解鎖狀態時除外)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"螢幕鎖定訊息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
@@ -386,7 +386,7 @@
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"仍要略過"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"輕觸感應器"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器位於手機背面。請使用食指輕觸感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器在手機背面。請使用食指輕觸感應器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置和指紋感應器位置圖示"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
@@ -394,10 +394,10 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將手指放在感應器上，直至感到震動時放開"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"提起手指，然後再次輕觸感應器"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"重覆按壓指紋感應器，即可加入各個部分的指紋"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"重覆按壓指紋感應器，加入指紋的不同部分"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"已加入指紋"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"看到此圖示時，請使用您的指紋識別身份或核准購物交易。"</string>
-    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後註冊"</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後再做"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
@@ -807,7 +807,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
     <string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇 AP 頻段"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇存取點頻段"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz 頻段"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz 頻段"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
@@ -1062,7 +1062,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"充電或放上插座時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任何一個狀態"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安放在插座上時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"放上插座時"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"永不"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"如要控制手機在插座上和/或休眠時的操作，請開啟螢幕保護程式。"</string>
@@ -1471,11 +1471,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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定上鎖圖案"</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_pin_message" msgid="1875420718677275646">"為安全起見，請設定 PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"如要使用指紋，請設定 PIN"</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>
@@ -1528,7 +1527,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"顯示設定檔的解鎖圖案"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"輕按時震動"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"電源按鈕立即上鎖"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"由「<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>」維持解鎖狀態時除外"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"設定解鎖圖形"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"更改解鎖圖形"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖形"</string>
@@ -2456,7 +2455,7 @@
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"如要選取按用量收費的網絡，請開啟 Wi-Fi。"</string>
     <string name="data_usage_metered_auto" msgid="1262028400911918865">"自動"</string>
     <string name="data_usage_metered_yes" msgid="9217539611385225894">"按用量收費"</string>
-    <string name="data_usage_metered_no" msgid="4025232961929071789">"並非按用量收費"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"非按用量收費"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
@@ -3337,7 +3336,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"星期二下午 6:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"星期二下午 6:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"未連線"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g>數據"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"使用了 <xliff:g id="AMOUNT">%1$s</xliff:g> 數據"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">已停用 <xliff:g id="COUNT">%d</xliff:g> 個應用程式的通知</item>
       <item quantity="one">已停用 1 個應用程式的通知</item>
@@ -3405,12 +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>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <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>
@@ -3435,11 +3431,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"設定數據警告"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"設定數據用量警告"</string>
     <string name="data_warning" msgid="209133958008062117">"數據用量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"設定數據上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"數據上限"</string>
-    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g>期間已使用 <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"其他使用數據的應用程式"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 165317d..163a6d2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -1470,11 +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>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定解鎖圖案"</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_pin_message" msgid="1875420718677275646">"為了安全起見，請設定 PIN 碼"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"如要使用指紋，請設定 PIN 碼"</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>
@@ -3406,12 +3405,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor 會在偵測到連線問題時收集相關紀錄，並顯示通知方便使用者回報錯誤"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"如要套用 Connectivity Monitor 的變更內容，請重新啟動裝置"</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-zu/strings.xml b/res/values-zu/strings.xml
index d1e37f4..11f1a96 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -1471,11 +1471,10 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setha ukukhiya kwesikrini"</string>
     <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ngokuphepha, setha iphasiwedi"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ngokuphepha, setha i-PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_fingerprint (1549639053195796674) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Ukuze usebenzise isigxivizo somunwe, setha i-PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ngokuphepha, setha iphethini"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Faka kabusha iphasiwedi yakho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
@@ -3403,12 +3402,9 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
-    <!-- no translation found for connectivity_monitor_switch (9059759348648583421) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_switch_summary (2828658652378866401) -->
-    <skip />
-    <!-- no translation found for connectivity_monitor_toast (5551859612881173028) -->
-    <skip />
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Isingameli sokuxhuma"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"I-ConnectivityMonitor izoqoqa amalogo uma ithola inkinga yokuxhuma nesaziso somyalo kumsebenzisi ukufayela sesiphazamisi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Ikhamera ye-HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ukuze usebenzise ikhamera ye-HAL HDR+ ushintsho, qalisa idivayisi"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Inzwa ye-Laser yekhamera"</string>

diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 240191d..a49cfff 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml

@@ -349,7 +349,7 @@
                 android:summary="@string/force_hw_ui_summary"/>
 
         <SwitchPreference
-                android:key="show_hw_screen_udpates"
+                android:key="show_hw_screen_updates"
                 android:title="@string/show_hw_screen_updates"
                 android:summary="@string/show_hw_screen_updates_summary"/>
 
@@ -467,6 +467,11 @@
             android:title="@string/force_resizable_activities"
             android:summary="@string/force_resizable_activities_summary"/>
 
+        <SwitchPreference
+                android:key="enable_freeform_support"
+                android:title="@string/enable_freeform_support"
+                android:summary="@string/enable_freeform_support_summary"/>
+
         <Preference
             android:key="reset_shortcut_manager_throttling"
             android:title="@string/reset_shortcut_manager_throttling" />

diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index 87aec14..0e19dab 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java

@@ -34,6 +34,7 @@
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -135,8 +136,8 @@
                 // startPreferencePanel() there. In order to inject the title string there, more
                 // dirty further hack is still needed. It's much easier and cleaner to listen to
                 // preference click event here directly.
-                if (intent.getAction().equals(
-                    android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
+                if (TextUtils.equals(intent.getAction(),
+                        android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
                     // The OnPreferenceClickListener overrides the click event completely. No intent
                     // will get fired.
                     pref.setOnPreferenceClickListener(new FragmentStarter(

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 2f44d3e..ccd91fd 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java

@@ -982,11 +982,9 @@
             } else {
                 mMetricsFeatureProvider.action(
                         getActivity(),
-                        mAppEntry.info.enabled
-                                ? MetricsEvent.ACTION_SETTINGS_DISABLE_APP
-                                : MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
+                        MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
                 new DisableChanger(this, mAppEntry.info,
-                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
                         .execute((Object) null);
             }
         } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {

diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 600b23b..9c61873 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java

@@ -601,6 +601,9 @@
         }
 
         public Drawable getIcon(Icon icon) {
+            if (icon == null) {
+                return null;
+            }
             Drawable drawable = mMap.get(icon);
             if (drawable == null) {
                 drawable = icon.loadDrawable(mContext);

diff --git a/src/com/android/settings/dashboard/suggestions/EventStore.java b/src/com/android/settings/dashboard/suggestions/EventStore.java
index 43ed65b..cc3872e 100644
--- a/src/com/android/settings/dashboard/suggestions/EventStore.java
+++ b/src/com/android/settings/dashboard/suggestions/EventStore.java

@@ -82,7 +82,7 @@
     }
 
     private void writePref(String prefKey, long value) {
-        mSharedPrefs.edit().putLong(prefKey, value).commit();
+        mSharedPrefs.edit().putLong(prefKey, value).apply();
     }
 
     private long readPref(String prefKey, Long defaultValue) {

diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 38b9d28..de266e1 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

@@ -96,8 +96,7 @@
         //                  itemView));
         //        } else
         {
-            // TODO: Add icon field in Suggestion, and enable this.
-            //            holder.icon.setImageDrawable(mCache.getIcon(suggestion.icon));
+            holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
             holder.title.setText(suggestion.getTitle());
             final CharSequence summary = suggestion.getSummary();
             if (!TextUtils.isEmpty(summary)) {

diff --git a/src/com/android/settings/development/AdbClearKeysDialogHost.java b/src/com/android/settings/development/AdbClearKeysDialogHost.java
new file mode 100644
index 0000000..7f69f76
--- /dev/null
+++ b/src/com/android/settings/development/AdbClearKeysDialogHost.java

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * Interface for AdbClearKeysDialogFragment callbacks.
+ */
+public interface AdbClearKeysDialogHost {
+
+    /**
+     * Called when the user presses ok on the warning dialog.
+     */
+    void onAdbClearKeysDialogConfirmed();
+}

diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
new file mode 100644
index 0000000..fb69455
--- /dev/null
+++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java

@@ -0,0 +1,83 @@
+/*
+ * 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.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class AllowAppsOnExternalPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+
+    private SwitchPreference mPreference;
+
+    public AllowAppsOnExternalPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_ALLOW_ON_EXTERNAL_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}

diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
new file mode 100644
index 0000000..3f454ea
--- /dev/null
+++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java

@@ -0,0 +1,81 @@
+/*
+ * 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.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class AppsNotRespondingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public AppsNotRespondingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_ALL_ANRS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}

diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
index 4032826..2c448f5 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java

@@ -28,6 +28,10 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+/**
+ * deprecated in favor of {@link BugReportInPowerPreferenceControllerV2}
+ */
+@Deprecated
 public class BugReportInPowerPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 
@@ -46,8 +50,8 @@
         if (KEY_BUGREPORT_IN_POWER.equals(preference.getKey())) {
             final SwitchPreference switchPreference = (SwitchPreference) preference;
             Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU,
-                switchPreference.isChecked() ? 1 : 0);
+                    Settings.Global.BUGREPORT_IN_POWER_MENU,
+                    switchPreference.isChecked() ? 1 : 0);
             setBugreportStorageProviderStatus();
             return true;
         }
@@ -95,7 +99,7 @@
             return false;
         }
         final boolean enabled = Settings.Secure.getInt(
-            mContext.getContentResolver(), Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0;
+                mContext.getContentResolver(), Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0;
         mPreference.setChecked(enabled);
         return enabled;
     }
@@ -110,12 +114,12 @@
 
     private void setBugreportStorageProviderStatus() {
         final ComponentName componentName = new ComponentName("com.android.shell",
-            "com.android.shell.BugreportStorageProvider");
+                "com.android.shell.BugreportStorageProvider");
         final boolean enabled = mPreference.isChecked();
         mContext.getPackageManager().setComponentEnabledSetting(componentName,
-            enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-            0);
+                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                0);
     }
 
 }

diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java b/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java
new file mode 100644
index 0000000..34a95a6
--- /dev/null
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java

@@ -0,0 +1,106 @@
+/*
+ * 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.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class BugReportInPowerPreferenceControllerV2 extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
+
+    @VisibleForTesting
+    static final ComponentName COMPONENT_NAME = new ComponentName("com.android.shell",
+            "com.android.shell.BugreportStorageProvider");
+    @VisibleForTesting
+    static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static int SETTING_VALUE_OFF = 0;
+
+    private final PackageManagerWrapper mPackageManager;
+    private final UserManager mUserManager;
+    private SwitchPreference mPreference;
+
+    public BugReportInPowerPreferenceControllerV2(Context context) {
+        super(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BUGREPORT_IN_POWER;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(KEY_BUGREPORT_IN_POWER);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        setBugreportStorageProviderStatus(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // no-op because this preference can never be disabled
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
+        setBugreportStorageProviderStatus(false);
+        mPreference.setChecked(false);
+    }
+
+    private void setBugreportStorageProviderStatus(boolean isEnabled) {
+        mPackageManager.setComponentEnabledSetting(COMPONENT_NAME,
+                isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
+    }
+}

diff --git a/src/com/android/settings/development/BugReportPreferenceController.java b/src/com/android/settings/development/BugReportPreferenceController.java
index 015071f..c05dd26 100644
--- a/src/com/android/settings/development/BugReportPreferenceController.java
+++ b/src/com/android/settings/development/BugReportPreferenceController.java

@@ -24,6 +24,10 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+/**
+ * deprecated in favor of {@link BugReportPreferenceControllerV2}
+ */
+@Deprecated
 public class BugReportPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
 

diff --git a/src/com/android/settings/development/BugReportPreferenceControllerV2.java b/src/com/android/settings/development/BugReportPreferenceControllerV2.java
new file mode 100644
index 0000000..7df23a6
--- /dev/null
+++ b/src/com/android/settings/development/BugReportPreferenceControllerV2.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 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.os.UserManager;
+
+public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
+
+    private static final String KEY_BUGREPORT = "bugreport";
+
+    private final UserManager mUserManager;
+
+    public BugReportPreferenceControllerV2(Context context) {
+        super(context);
+
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BUGREPORT;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // intentional no-op
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+    }
+}

diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
new file mode 100644
index 0000000..9c93280
--- /dev/null
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java

@@ -0,0 +1,105 @@
+/*
+ * 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.hardware.usb.IUsbManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController {
+
+    private static final String TAG = "ClearAdbPrefCtrl";
+    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
+
+    @VisibleForTesting
+    static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
+
+    private final IUsbManager mUsbManager;
+    private final DevelopmentSettingsDashboardFragment mFragment;
+
+    private Preference mPreference;
+
+    public ClearAdbKeysPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+
+        mFragment = fragment;
+        mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return SystemProperties.getBoolean(RO_ADB_SECURE_PROPERTY_KEY, false /* default */);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CLEAR_ADB_KEYS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+        if (mPreference != null && !isAdminUser()) {
+            mPreference.setEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            ClearAdbKeysWarningDialog.show(mFragment);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        if (isAdminUser()) {
+            mPreference.setEnabled(true);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    public void onClearAdbKeysConfirmed() {
+        try {
+            mUsbManager.clearUsbDebuggingKeys();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to clear adb keys", e);
+        }
+    }
+
+    @VisibleForTesting
+    boolean isAdminUser() {
+        return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();
+    }
+}

diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java
new file mode 100644
index 0000000..61b55a0
--- /dev/null
+++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java

@@ -0,0 +1,67 @@
+/*
+ * 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.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "ClearAdbKeysDlg";
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final ClearAdbKeysWarningDialog dialog =
+                    new ClearAdbKeysWarningDialog();
+            dialog.setTargetFragment(host, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_CLEAR_ADB_KEYS;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.adb_keys_warning_message)
+                .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+                .setNegativeButton(android.R.string.cancel, null /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final AdbClearKeysDialogHost host = (AdbClearKeysDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        host.onAdbClearKeysDialogConfirmed();
+    }
+}

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 947e967..980d976 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java

@@ -146,7 +146,7 @@
     private static final String FORCE_MSAA_KEY = "force_msaa";
     private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
     private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
-    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
+    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";
     private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
     private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
@@ -167,6 +167,7 @@
     private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
     private static final String KEY_COLOR_MODE = "picture_color_mode";
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
+    private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support";
     private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
 
     private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
@@ -312,6 +313,8 @@
 
     private SwitchPreference mForceResizable;
 
+    private SwitchPreference mEnableFreeformSupport;
+
     private SwitchPreference mColorTemperaturePreference;
 
     private final ArrayList<Preference> mAllPrefs = new ArrayList<>();
@@ -495,6 +498,8 @@
         mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
         mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
         mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
+        mEnableFreeformSupport = findAndInitSwitchPref(ENABLE_FREEFORM_SUPPORT_KEY);
+        removePreferenceForProduction(mEnableFreeformSupport);
 
         mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
                 IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
@@ -612,7 +617,16 @@
     }
 
     private void removePreference(Preference preference) {
-        getPreferenceScreen().removePreference(preference);
+        if (preference == null) {
+            return;
+        }
+
+        final PreferenceGroup parent = preference.getParent();
+
+        if (parent != null) {
+            parent.removePreference(preference);
+        }
+
         mAllPrefs.remove(preference);
         mResetSwitchPrefs.remove(preference);
     }
@@ -823,6 +837,7 @@
         updateSimulateColorSpace();
         updateUSBAudioOptions();
         updateForceResizableOptions();
+        updateEnableFreeformWindowsSupportOptions();
         Preference webViewAppPref = findPreference(mWebViewAppPrefController.getPreferenceKey());
         mWebViewAppPrefController.updateState(webViewAppPref);
         updateOemUnlockOptions();
@@ -1421,6 +1436,17 @@
                 mForceResizable.isChecked() ? 1 : 0);
     }
 
+    private void updateEnableFreeformWindowsSupportOptions() {
+        updateSwitchPreference(mEnableFreeformSupport, Settings.Global.getInt(getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0);
+    }
+
+    private void writeEnableFreeformWindowsSupportOptions() {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,
+                mEnableFreeformSupport.isChecked() ? 1 : 0);
+    }
+
     private void updateForceRtlOptions() {
         updateSwitchPreference(mForceRtlLayout,
                 Settings.Global.getInt(getActivity().getContentResolver(),
@@ -2329,6 +2355,8 @@
             writeUSBAudioOptions();
         } else if (preference == mForceResizable) {
             writeForceResizableOptions();
+        } else if (preference == mEnableFreeformSupport){
+            writeEnableFreeformWindowsSupportOptions();
         } else if (preference == mBluetoothShowDevicesWithoutNames) {
             writeBluetoothShowDevicesWithoutUserFriendlyNameOptions();
         } else if (preference == mBluetoothDisableAbsVolume) {

diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 320bbcd..767c7ca 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -50,7 +50,8 @@
 import java.util.List;
 
 public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
-        implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost {
+        implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
+        AdbClearKeysDialogHost {
 
     private static final String TAG = "DevSettingsDashboard";
 
@@ -171,6 +172,13 @@
     }
 
     @Override
+    public void onAdbClearKeysDialogConfirmed() {
+        final ClearAdbKeysPreferenceController controller = getDevelopmentOptionsController(
+                ClearAdbKeysPreferenceController.class);
+        controller.onClearAdbKeysConfirmed();
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         boolean handledResult = false;
         for (AbstractPreferenceController controller : mPreferenceControllers) {
@@ -237,29 +245,29 @@
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        // take bug report
-        // desktop backup password
+        controllers.add(new BugReportPreferenceControllerV2(context));
+        controllers.add(new LocalBackupPasswordPreferenceController(context));
         controllers.add(new StayAwakePreferenceController(context, lifecycle));
         // hdcp checking
         controllers.add(new BluetoothSnoopLogPreferenceController(context));
         controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
         // running services
-        // convert to file encryption
+        controllers.add(new FileEncryptionPreferenceController(context));
         controllers.add(new PictureColorModePreferenceController(context, lifecycle));
-        // webview implementation
+        controllers.add(new WebViewAppPreferenceControllerV2(context));
         controllers.add(new CoolColorTemperaturePreferenceController(context));
         controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
         // system ui demo mode
         // quick settings developer tiles
         controllers.add(new AdbPreferenceController(context, fragment));
-        // revoke usb debugging authorizations
+        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
         controllers.add(new LocalTerminalPreferenceController(context));
-        // bug report shortcut
+        controllers.add(new BugReportInPowerPreferenceControllerV2(context));
         // select mock location app
         controllers.add(new DebugViewAttributesPreferenceController(context));
         controllers.add(new SelectDebugAppPreferenceController(context, fragment));
         controllers.add(new WaitForDebuggerPreferenceController(context));
-        // verify apps over usb
+        controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
         // logger buffer sizes
         // store logger data persistently on device
         controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
@@ -285,7 +293,7 @@
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
-        // show layout bounds
+        controllers.add(new ShowLayoutBoundsPreferenceController(context));
         controllers.add(new RtlLayoutPreferenceController(context));
         // window animation scale
         // transition animation scale
@@ -293,26 +301,26 @@
         // simulate secondary displays
         // smallest width
         controllers.add(new ForceGpuRenderingPreferenceController(context));
-        // show gpu view updates
+        controllers.add(new GpuViewUpdatesPreferenceController(context));
         controllers.add(new HardwareLayersUpdatesPreferenceController(context));
         // debug gpu overdraw
         // debug non-rectangular clip operations
         controllers.add(new ForceMSAAPreferenceController(context));
-        // disable hw overlays
+        controllers.add(new HardwareOverlaysPreferenceController(context));
         // simulate color space
         // set gpu renderer
-        // disable usb audio routing
-        // strict mode enabled
+        controllers.add(new UsbAudioRoutingPreferenceController(context));
+        controllers.add(new StrictModePreferenceController(context));
         // profile gpu rendering
-        // don't keep activities
+        controllers.add(new KeepActivitiesPreferenceController(context));
         // background process limit
         // background check
-        // show all anrs
-        // show notification channel warnings
+        controllers.add(new AppsNotRespondingPreferenceController(context));
+        controllers.add(new NotificationChannelWarningsPreferenceController(context));
         // inactive apps
-        // force allow apps on external
-        // force activities to be resizable
-        // reset shortcutmanager rate-limiting
+        controllers.add(new AllowAppsOnExternalPreferenceController(context));
+        controllers.add(new ResizableActivityPreferenceController(context));
+        controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
         return controllers;
     }
 

diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
new file mode 100644
index 0000000..463bb70
--- /dev/null
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java

@@ -0,0 +1,105 @@
+/*
+ * 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.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.storage.IStorageManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+
+public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController {
+
+    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
+    private static final String KEY_STORAGE_MANAGER = "mount";
+
+    @VisibleForTesting
+    static final String FILE_ENCRYPTION_PROPERTY_KEY = "ro.crypto.type";
+
+    private final IStorageManager mStorageManager;
+
+    private Preference mPreference;
+
+    public FileEncryptionPreferenceController(Context context) {
+        super(context);
+
+        mStorageManager = getStorageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mStorageManager == null) {
+            return false;
+        }
+
+        try {
+            return mStorageManager.isConvertibleToFBE();
+        } catch (RemoteException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CONVERT_FBE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!TextUtils.equals("file",
+                SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {
+            return;
+        }
+
+        mPreference.setEnabled(false);
+        mPreference.setSummary(
+                mContext.getResources().getString(R.string.convert_to_file_encryption_done));
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // intentional no-op
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+    }
+
+    private IStorageManager getStorageManager() {
+        try {
+            return IStorageManager.Stub.asInterface(
+                    ServiceManager.getService(KEY_STORAGE_MANAGER));
+        } catch (VerifyError e) {
+            // Used for tests since Robolectric cannot initialize this class.
+            return null;
+        }
+    }
+}
\ No newline at end of file

diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
new file mode 100644
index 0000000..1538da4
--- /dev/null
+++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java

@@ -0,0 +1,78 @@
+/*
+ * 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.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settingslib.development.SystemPropPoker;
+
+public class GpuViewUpdatesPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
+
+    private SwitchPreference mPreference;
+
+    public GpuViewUpdatesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_HW_SCREEN_UPDATES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                isEnabled ? "true" : null);
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, null);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}

diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
new file mode 100644
index 0000000..e6d4798
--- /dev/null
+++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java

@@ -0,0 +1,134 @@
+/*
+ * 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.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
+
+    private static final int SETTING_VALUE_ON = 1;
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+
+    @VisibleForTesting
+    static final int SURFACE_FLINGER_READ_CODE = 1010;
+
+    private static final int SURFACE_FLINGER_DISABLE_OVERLAYS_CODE = 1008;
+    private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+
+    private final IBinder mSurfaceFlinger;
+    private SwitchPreference mPreference;
+
+    public HardwareOverlaysPreferenceController(Context context) {
+        super(context);
+        mSurfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DISABLE_OVERLAYS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeHardwareOverlaysSetting(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateHardwareOverlaysSetting();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        if (mPreference.isChecked()) {
+            // Writing false to the preference when the setting is already off will have a
+            // side effect of turning on the preference that we wish to avoid
+            writeHardwareOverlaysSetting(false);
+            mPreference.setChecked(false);
+        }
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void updateHardwareOverlaysSetting() {
+        if (mSurfaceFlinger == null) {
+            return;
+        }
+        // magic communication with surface flinger.
+        try {
+            final Parcel data = Parcel.obtain();
+            final Parcel reply = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            mSurfaceFlinger.transact(SURFACE_FLINGER_READ_CODE, data, reply, 0 /* flags */);
+            @SuppressWarnings("unused") final int showCpu = reply.readInt();
+            @SuppressWarnings("unused") final int enableGL = reply.readInt();
+            @SuppressWarnings("unused") final int showUpdates = reply.readInt();
+            @SuppressWarnings("unused") final int showBackground = reply.readInt();
+            final int disableOverlays = reply.readInt();
+            mPreference.setChecked(disableOverlays != SETTING_VALUE_OFF);
+            reply.recycle();
+            data.recycle();
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    void writeHardwareOverlaysSetting(boolean isEnabled) {
+        if (mSurfaceFlinger == null) {
+            return;
+        }
+        try {
+            final Parcel data = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            final int disableOverlays = isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF;
+            data.writeInt(disableOverlays);
+            mSurfaceFlinger.transact(SURFACE_FLINGER_DISABLE_OVERLAYS_CODE, data,
+                    null /* reply */, 0 /* flags */);
+            data.recycle();
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+        updateHardwareOverlaysSetting();
+    }
+}

diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
new file mode 100644
index 0000000..437fd9d
--- /dev/null
+++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java

@@ -0,0 +1,96 @@
+/*
+ * 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.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY =
+            "immediately_destroy_activities";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private IActivityManager mActivityManager;
+    private SwitchPreference mPreference;
+
+    public KeepActivitiesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return IMMEDIATELY_DESTROY_ACTIVITIES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+        mActivityManager = getActivityManager();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeImmediatelyDestroyActivitiesOptions(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeImmediatelyDestroyActivitiesOptions(false);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    private void writeImmediatelyDestroyActivitiesOptions(boolean isEnabled) {
+        try {
+            mActivityManager.setAlwaysFinish(isEnabled);
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    IActivityManager getActivityManager() {
+        return ActivityManager.getService();
+    }
+}

diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
new file mode 100644
index 0000000..b509448
--- /dev/null
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java

@@ -0,0 +1,85 @@
+/*
+ * 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.app.backup.IBackupManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+
+public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController {
+
+    private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
+
+    private final UserManager mUserManager;
+    private final IBackupManager mBackupManager;
+
+    public LocalBackupPasswordPreferenceController(Context context) {
+        super(context);
+
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mBackupManager = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return LOCAL_BACKUP_PASSWORD;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePasswordSummary(preference);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // intentional no-op
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+    }
+
+    private void updatePasswordSummary(Preference preference) {
+        preference.setEnabled(isAdminUser() && mBackupManager != null);
+        if (mBackupManager == null) {
+            return;
+        }
+        try {
+            if (mBackupManager.hasBackupPassword()) {
+                preference.setSummary(R.string.local_backup_password_summary_change);
+            } else {
+                preference.setSummary(R.string.local_backup_password_summary_none);
+            }
+        } catch (RemoteException e) {
+            // Not much we can do here
+        }
+    }
+
+    @VisibleForTesting
+    boolean isAdminUser() {
+        return mUserManager.isAdminUser();
+    }
+}

diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
new file mode 100644
index 0000000..c0382f2
--- /dev/null
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java

@@ -0,0 +1,95 @@
+/*
+ * 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.os.Build;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class NotificationChannelWarningsPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY =
+            "show_notification_channel_warnings";
+
+    private SwitchPreference mPreference;
+
+    @VisibleForTesting
+    final static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    final static int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    final static int DEBUGGING_ENABLED = 1;
+    @VisibleForTesting
+    final static int DEBUGGING_DISABLED = 0;
+
+    public NotificationChannelWarningsPreferenceController(Context context) {
+        super(context);
+    }
+
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED;
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    @VisibleForTesting
+    boolean isDebuggable() {
+        return Build.IS_DEBUGGABLE;
+    }
+}

diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java
new file mode 100644
index 0000000..70be4b6
--- /dev/null
+++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java

@@ -0,0 +1,82 @@
+/*
+ * 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.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class ResizableActivityPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
+
+    @VisibleForTesting
+    final static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    final static int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public ResizableActivityPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_RESIZABLE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}

diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
new file mode 100644
index 0000000..c8fdaec
--- /dev/null
+++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java

@@ -0,0 +1,91 @@
+/*
+ * 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.pm.IShortcutService;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.settings.R;
+
+public class ShortcutManagerThrottlingPreferenceController extends
+        DeveloperOptionsPreferenceController {
+
+    private static final String TAG = "ShortcutMgrPrefCtrl";
+
+    private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling";
+
+    private final IShortcutService mShortcutService;
+
+    public ShortcutManagerThrottlingPreferenceController(Context context) {
+        super(context);
+
+        mShortcutService = getShortCutService();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHORTCUT_MANAGER_RESET_KEY;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(SHORTCUT_MANAGER_RESET_KEY, preference.getKey())) {
+            return false;
+        }
+        resetShortcutManagerThrottling();
+        return true;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // intentional no-op
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+    }
+
+    private void resetShortcutManagerThrottling() {
+        if (mShortcutService == null) {
+            return;
+        }
+        try {
+            mShortcutService.resetThrottling();
+            Toast.makeText(mContext, R.string.reset_shortcut_manager_throttling_complete,
+                    Toast.LENGTH_SHORT).show();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to reset rate limiting", e);
+        }
+    }
+
+    private IShortcutService getShortCutService() {
+        try {
+            return IShortcutService.Stub.asInterface(
+                    ServiceManager.getService(Context.SHORTCUT_SERVICE));
+        } catch (VerifyError e) {
+            // Used for tests since Robolectric cannot initialize this class.
+            return null;
+        }
+    }
+}

diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
new file mode 100644
index 0000000..fa13a58
--- /dev/null
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java

@@ -0,0 +1,78 @@
+/*
+ * 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.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
+
+    private SwitchPreference mPreference;
+
+    public ShowLayoutBoundsPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_LAYOUT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY,
+                false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}

diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java
new file mode 100644
index 0000000..037f66e
--- /dev/null
+++ b/src/com/android/settings/development/StrictModePreferenceController.java

@@ -0,0 +1,101 @@
+/*
+ * 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.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.StrictMode;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+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;
+
+public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener {
+
+    private static final String STRICT_MODE_KEY = "strict_mode";
+    private static final String WINDOW_MANAGER_KEY = "window";
+
+    @VisibleForTesting
+    static final String STRICT_MODE_ENABLED = "1";
+    @VisibleForTesting
+    static final String STRICT_MODE_DISABLED = "";
+
+    private final IWindowManager mWindowManager;
+
+    private SwitchPreference mPreference;
+
+    public StrictModePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(WINDOW_MANAGER_KEY));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return STRICT_MODE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeStrictModeVisualOptions(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mPreference.setChecked(isStrictModeEnabled());
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeStrictModeVisualOptions(false);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    private boolean isStrictModeEnabled() {
+        return SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY, false /* default */);
+    }
+
+    private void writeStrictModeVisualOptions(boolean isEnabled) {
+        try {
+            mWindowManager.setStrictModeVisualIndicatorPreference(
+                    isEnabled ? STRICT_MODE_ENABLED : STRICT_MODE_DISABLED);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}

diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
new file mode 100644
index 0000000..3cd2a2b
--- /dev/null
+++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java

@@ -0,0 +1,82 @@
+/*
+ * 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.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String USB_AUDIO_KEY = "usb_audio";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public UsbAudioRoutingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return USB_AUDIO_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
+        mPreference.setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}

diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
index d7891c7..4fd7fbc 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java

@@ -37,7 +37,10 @@
 
 /**
  * Controller to manage the state of "Verify apps over USB" toggle.
+ *
+ * deprecated in favor of {@link VerifyAppsOverUsbPreferenceControllerV2}
  */
+@Deprecated
 public class VerifyAppsOverUsbPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
     private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";

diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java
new file mode 100644
index 0000000..76c8669
--- /dev/null
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java

@@ -0,0 +1,172 @@
+/*
+ * 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.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import java.util.List;
+
+/**
+ * Controller to manage the state of "Verify apps over USB" toggle.
+ */
+public class VerifyAppsOverUsbPreferenceControllerV2 extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        AdbOnChangeListener {
+    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";
+
+    private RestrictedSwitchPreference mPreference;
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    /**
+     * Class for indirection of RestrictedLockUtils for testing purposes. It would be nice to mock
+     * the appropriate methods in UserManager instead but they aren't accessible.
+     */
+    @VisibleForTesting
+    class RestrictedLockUtilsDelegate {
+        public EnforcedAdmin checkIfRestrictionEnforced(
+                Context context, String userRestriction, int userId) {
+            return RestrictedLockUtils.checkIfRestrictionEnforced(context, userRestriction, userId);
+        }
+    }
+
+    // NB: This field is accessed using reflection in the test, please keep name in sync.
+    private final RestrictedLockUtilsDelegate mRestrictedLockUtils =
+            new RestrictedLockUtilsDelegate();
+
+    // This field is accessed using reflection in the test, please keep name in sync.
+    private final PackageManagerWrapper mPackageManager;
+
+    public VerifyAppsOverUsbPreferenceControllerV2(Context context) {
+        super(context);
+
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1 /* default */) > 0;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return VERIFY_APPS_OVER_USB_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!shouldBeEnabled()) {
+            mPreference.setChecked(false);
+            mPreference.setDisabledByAdmin(null);
+            mPreference.setEnabled(false);
+            return;
+        }
+
+        final EnforcedAdmin enforcingAdmin = mRestrictedLockUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.ENSURE_VERIFY_APPS, UserHandle.myUserId());
+        if (enforcingAdmin != null) {
+            mPreference.setChecked(true);
+            mPreference.setDisabledByAdmin(enforcingAdmin);
+            return;
+        }
+
+        mPreference.setEnabled(true);
+        final boolean checked = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, SETTING_VALUE_ON)
+                != SETTING_VALUE_OFF;
+        mPreference.setChecked(checked);
+    }
+
+    @Override
+    public void onAdbSettingChanged() {
+        if (isAvailable()) {
+            updateState(mPreference);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        updateState(mPreference);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+        // We can rely on onAdbSettingChanged() to update this controller.
+    }
+
+    /**
+     * Checks whether the toggle should be enabled depending on whether verify apps over USB is
+     * possible currently. If ADB is disabled or if package verifier does not exist, the toggle
+     * should be disabled.
+     */
+    private boolean shouldBeEnabled() {
+        final ContentResolver cr = mContext.getContentResolver();
+        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED,
+                AdbPreferenceController.ADB_SETTING_OFF)
+                == AdbPreferenceController.ADB_SETTING_OFF) {
+            return false;
+        }
+        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, SETTING_VALUE_ON)
+                == SETTING_VALUE_OFF) {
+            return false;
+        } else {
+            final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
+            verification.setType(PACKAGE_MIME_TYPE);
+            verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            final List<ResolveInfo> receivers = mPackageManager.queryBroadcastReceivers(
+                    verification, 0 /* flags */);
+            if (receivers.size() == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

diff --git a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
new file mode 100644
index 0000000..61a98aa
--- /dev/null
+++ b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java

@@ -0,0 +1,101 @@
+/*
+ * 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.pm.PackageInfo;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.webview.WebViewUpdateServiceWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class WebViewAppPreferenceControllerV2 extends DeveloperOptionsPreferenceController {
+
+    private static final String TAG = "WebViewAppPrefCtrl";
+    private static final String WEBVIEW_APP_KEY = "select_webview_provider";
+
+    private final PackageManagerWrapper mPackageManager;
+    private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
+
+    private Preference mPreference;
+
+    public WebViewAppPreferenceControllerV2(Context context) {
+        super(context);
+
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+        mWebViewUpdateServiceWrapper = new WebViewUpdateServiceWrapper();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WEBVIEW_APP_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        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);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    DefaultAppInfo getDefaultAppInfo() {
+        final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
+        return new DefaultAppInfo(mPackageManager,
+                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/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
index b419b72..d649c0b 100644
--- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java

@@ -117,12 +117,12 @@
     public void setListener(Listener listener) {
         if (mListener == null && listener != null) {
             if (mAuthenticationResult != null) {
-                mListener.onAuthenticationSucceeded(mAuthenticationResult);
+                listener.onAuthenticationSucceeded(mAuthenticationResult);
                 mAuthenticationResult = null;
             }
             if (mAuthenticationError != null &&
                     mAuthenticationError.error != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
-                mListener.onAuthenticationError(mAuthenticationError.error,
+                listener.onAuthenticationError(mAuthenticationError.error,
                         mAuthenticationError.errorString);
                 mAuthenticationError = null;
             }

diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index 819d5f7..d3fcf9a 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java

@@ -47,8 +47,8 @@
             supportFeatureProvider.startSupportV2(this);
         } else {
             startActivity(new Intent(this, LegacySupportActivity.class));
-            finish();
         }
+        finish();
     }
 
     /**

diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java
index c774093..96db801 100644
--- a/src/com/android/settings/webview/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/webview/WebViewAppPreferenceController.java

@@ -22,6 +22,10 @@
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
 
+/**
+ * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2}
+ */
+@Deprecated
 public class WebViewAppPreferenceController extends DefaultAppPreferenceController {
 
     private static final String WEBVIEW_APP_KEY = "select_webview_provider";

diff --git a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java
index e4eb0fc..fa1cd3d 100644
--- a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java
+++ b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java

@@ -34,7 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class WebViewUpdateServiceWrapper {
+public class WebViewUpdateServiceWrapper {
     private static final String TAG = "WVUSWrapper";
 
     public WebViewUpdateServiceWrapper() {}

diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index d163616..9f52159 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java

@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import android.annotation.Nullable;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.icu.text.Collator;
@@ -28,6 +29,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
+import android.widget.Toast;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -88,6 +90,22 @@
         }
     };
 
+    private final WifiManager.ActionListener mSaveListener = new WifiManager.ActionListener() {
+        @Override
+        public void onSuccess() {
+            postUpdatePreference();
+        }
+        @Override
+        public void onFailure(int reason) {
+            Activity activity = getActivity();
+            if (activity != null) {
+                Toast.makeText(activity,
+                    R.string.wifi_failed_save_message,
+                    Toast.LENGTH_SHORT).show();
+            }
+        }
+    };
+
     private WifiDialog mDialog;
     private WifiManagerWrapper mWifiManager;
     private AccessPoint mDlgAccessPoint;
@@ -267,7 +285,7 @@
 
     @Override
     public void onSubmit(WifiDialog dialog) {
-        // Ignored
+        mWifiManager.save(dialog.getController().getConfig(), mSaveListener);
     }
 
     @Override

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index b143f58..98af552 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java

@@ -37,9 +37,7 @@
 import android.net.wifi.WpsInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
-import android.os.HandlerThread;
 import android.os.PowerManager;
-import android.os.Process;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
@@ -162,8 +160,6 @@
     private WifiTracker mWifiTracker;
     private String mOpenSsid;
 
-    private HandlerThread mBgThread;
-
     private AccessPointPreference.UserBadgeCache mUserBadgeCache;
 
     private PreferenceCategory mConnectedAccessPointPreferenceCategory;
@@ -211,9 +207,6 @@
         addPreferences();
 
         mIsRestricted = isUiRestricted();
-
-        mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
-        mBgThread.start();
     }
 
     private void addPreferences() {
@@ -238,17 +231,11 @@
     }
 
     @Override
-    public void onDestroy() {
-        mBgThread.quit();
-        super.onDestroy();
-    }
-
-    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         mWifiTracker = WifiTrackerFactory.create(
-                getActivity(), this, mBgThread.getLooper(), true, true, false);
+                getActivity(), this, getLifecycle(), true, true);
         mWifiManager = mWifiTracker.getManager();
 
         mConnectListener = new WifiManager.ActionListener() {
@@ -350,8 +337,6 @@
         // On/off switch is hidden for Setup Wizard (returns null)
         mWifiEnabler = createWifiEnabler();
 
-        mWifiTracker.startTracking();
-
         if (mIsRestricted) {
             restrictUi();
             return;
@@ -430,7 +415,6 @@
 
     @Override
     public void onStop() {
-        mWifiTracker.stopTracking();
         getView().removeCallbacks(mUpdateAccessPointsRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
         super.onStop();
@@ -1137,7 +1121,7 @@
 
                 // Add saved Wi-Fi access points
                 final List<AccessPoint> accessPoints =
-                        WifiTracker.getCurrentAccessPoints(context, true, false, false);
+                        WifiTracker.getCurrentAccessPoints(context, true, false);
                 for (AccessPoint accessPoint : accessPoints) {
                     data = new SearchIndexableRaw(context);
                     data.title = accessPoint.getSsidStr();

diff --git a/src/com/android/settings/wrapper/WifiManagerWrapper.java b/src/com/android/settings/wrapper/WifiManagerWrapper.java
index 4202691..c788995 100644
--- a/src/com/android/settings/wrapper/WifiManagerWrapper.java
+++ b/src/com/android/settings/wrapper/WifiManagerWrapper.java

@@ -1,5 +1,6 @@
 package com.android.settings.wrapper;
 
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 
 /**
@@ -37,9 +38,16 @@
     }
 
     /**
-     * {@link WifiManager#removePasspointConfiguration}
+     * {@link WifiManager#forget}
      */
     public void forget(int netId, WifiManager.ActionListener listener) {
         mWifiManager.forget(netId, listener);
     }
+
+    /**
+     * {@link WifiManager#save}
+     */
+    public void save(WifiConfiguration config, WifiManager.ActionListener listener) {
+        mWifiManager.save(config, listener);
+    }
 }

diff --git a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
index 2bb6192..750bc05 100644
--- a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
+++ b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java

@@ -17,13 +17,16 @@
 package android.service.settings.suggestions;
 
 import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
 import android.os.Parcel;
 import android.text.TextUtils;
+import android.widget.RemoteViews;
 
 public class Suggestion {
     private final String mId;
     private final CharSequence mTitle;
     private final CharSequence mSummary;
+    private final Icon mIcon;
     private final PendingIntent mPendingIntent;
 
     /**
@@ -48,6 +51,13 @@
     }
 
     /**
+     * Optional icon for this suggestion.
+     */
+    public Icon getIcon() {
+        return mIcon;
+    }
+
+    /**
      * The Intent to launch when the suggestion is activated.
      */
     public PendingIntent getPendingIntent() {
@@ -57,17 +67,11 @@
     private Suggestion(Builder builder) {
         mTitle = builder.mTitle;
         mSummary = builder.mSummary;
+        mIcon = builder.mIcon;
         mPendingIntent = builder.mPendingIntent;
         mId = builder.mId;
     }
 
-    private Suggestion(Parcel in) {
-        mId = in.readString();
-        mTitle = in.readCharSequence();
-        mSummary = in.readCharSequence();
-        mPendingIntent = in.readParcelable(PendingIntent.class.getClassLoader());
-    }
-
     /**
      * Builder class for {@link Suggestion}.
      */
@@ -75,6 +79,7 @@
         private final String mId;
         private CharSequence mTitle;
         private CharSequence mSummary;
+        private Icon mIcon;
         private PendingIntent mPendingIntent;
 
         public Builder(String id) {
@@ -102,6 +107,14 @@
         }
 
         /**
+         * Sets icon for the suggestion.
+         */
+        public Builder setIcon(Icon icon) {
+            mIcon = icon;
+            return this;
+        }
+
+        /**
          * Sets suggestion intent
          */
         public Builder setPendingIntent(PendingIntent pendingIntent) {

diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
new file mode 100644
index 0000000..e23c4cc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java

@@ -0,0 +1,124 @@
+/*
+ * 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 com.android.settings.development.AllowAppsOnExternalPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.AllowAppsOnExternalPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 AllowAppsOnExternalPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private AllowAppsOnExternalPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AllowAppsOnExternalPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_allowAppsOnExternalShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_allowAppsOnExternalShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        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/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
new file mode 100644
index 0000000..15c84b5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java

@@ -0,0 +1,123 @@
+/*
+ * 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 com.android.settings.development.AppsNotRespondingPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.AppsNotRespondingPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 AppsNotRespondingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private AppsNotRespondingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AppsNotRespondingPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_appsNotRespondingDialogShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_appsNotRespondingDialogShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        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/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index f703b26..c61dfc6 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java

@@ -47,6 +47,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+/**
+ * deprecated in favor of {@link BugReportInPowerPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BugReportInPowerPreferenceControllerTest {

diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java
new file mode 100644
index 0000000..6fa1400
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java

@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2016 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 com.android.settings.development
+        .BugReportInPowerPreferenceControllerV2.COMPONENT_NAME;
+import static com.android.settings.development
+        .BugReportInPowerPreferenceControllerV2.SETTING_VALUE_OFF;
+import static com.android.settings.development
+        .BugReportInPowerPreferenceControllerV2.SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BugReportInPowerPreferenceControllerV2Test {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private ContentResolver mContentResolver;
+    private BugReportInPowerPreferenceControllerV2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mController = new BugReportInPowerPreferenceControllerV2(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+    }
+
+    @Test
+    public void isAvailable_hasDebugRestriction_shouldReturnFalse() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_noDebugRestriction_shouldReturnTrue() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldNotBeChecked() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldDisableBugReportInPowerSetting() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onPreferenceChange(mPreference, false /* new value */);
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldEnableBugReportInPowerSetting() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onPreferenceChange(mPreference, true /* new value */);
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */);
+    }
+
+
+    @Test
+    public void updateState_settingsOn_preferenceShouldBeChecked() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_ON);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingsOff_preferenceShouldNotBeChecked() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldTurnOffPreference() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onDeveloperOptionsSwitchDisabled();
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 3b3b482..d705610 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java

@@ -39,6 +39,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+/**
+ * deprecated in favor of {@link BugReportPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BugReportPreferenceControllerTest {

diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java
new file mode 100644
index 0000000..9b4cde6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2016 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BugReportPreferenceControllerV2Test {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private UserManager mUserManager;
+
+    private BugReportPreferenceControllerV2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mController = new BugReportPreferenceControllerV2(mContext);
+    }
+
+    @Test
+    public void isAvailable_hasDebugRestriction_shouldBeFalse() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_noDebugRestriction_shouldBeTrue() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
new file mode 100644
index 0000000..4bcdb98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java

@@ -0,0 +1,190 @@
+/*
+ * 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 com.android.settings.development.ClearAdbKeysPreferenceController
+        .RO_ADB_SECURE_PROPERTY_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.hardware.usb.IUsbManager;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+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 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;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class ClearAdbKeysPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private IUsbManager mUsbManager;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+
+    private ClearAdbKeysPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new ClearAdbKeysPreferenceController(mContext, mFragment));
+        ReflectionHelpers.setField(mController, "mUsbManager", mUsbManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowClearAdbKeysWarningDialog.resetDialog();
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_roAdbSecureEnabled_shouldBeTrue() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_roAdbSecureDisabled_shouldBeFalse() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(false));
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void displayPreference_isNotAdminUser_preferenceShouldBeDisabled() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(false).when(mController).isAdminUser();
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowClearAdbKeysWarningDialog.class
+    })
+    public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        final String preferenceKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+        final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(ShadowClearAdbKeysWarningDialog.sIsShowing).isTrue();
+        assertThat(isHandled).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_notClearAdbKeysPreference_shouldReturnFalse() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        when(mPreference.getKey()).thenReturn("Some random key!!!");
+        final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(isHandled).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_isNotAdminUser_shouldNotEnablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(false).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference, never()).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onClearAdbKeysConfirmed_shouldClearKeys() throws RemoteException {
+        mController.onClearAdbKeysConfirmed();
+
+        verify(mUsbManager).clearUsbDebuggingKeys();
+    }
+
+    @Implements(ClearAdbKeysWarningDialog.class)
+    public static class ShadowClearAdbKeysWarningDialog {
+
+        public static boolean sIsShowing;
+
+        @Implementation
+        public static void show(Fragment host) {
+            sIsShowing = true;
+        }
+
+        public static void resetDialog() {
+            sIsShowing = false;
+        }
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 7a48120..ddf5365 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java

@@ -114,7 +114,8 @@
     @Config(shadows = {
             ShadowPictureColorModePreferenceController.class,
             ShadowAdbPreferenceController.class,
-            ShadowBluetoothInbandRingingPreferenceController.class
+            ShadowBluetoothInbandRingingPreferenceController.class,
+            ShadowClearAdbKeysPreferenceController.class
     })
     public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
         final Context appContext = RuntimeEnvironment.application;
@@ -207,6 +208,17 @@
         verify(controller).onAdbDialogDismissed();
     }
 
+    @Test
+    public void onAdbClearKeysDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final ClearAdbKeysPreferenceController controller = mock(
+                ClearAdbKeysPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                ClearAdbKeysPreferenceController.class);
+        mDashboard.onAdbClearKeysDialogConfirmed();
+
+        verify(controller).onClearAdbKeysConfirmed();
+    }
+
     @Implements(EnableDevelopmentSettingWarningDialog.class)
     public static class ShadowEnableDevelopmentSettingWarningDialog {
 
@@ -247,4 +259,13 @@
             return true;
         }
     }
+
+    @Implements(ClearAdbKeysPreferenceController.class)
+    public static class ShadowClearAdbKeysPreferenceController {
+
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
 }

diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
new file mode 100644
index 0000000..1810b11
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java

@@ -0,0 +1,134 @@
+/*
+ * 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 com.android.settings.development.FileEncryptionPreferenceController
+        .FILE_ENCRYPTION_PROPERTY_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.os.storage.IStorageManager;
+import android.support.v7.preference.Preference;
+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.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class FileEncryptionPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IStorageManager mStorageManager;
+
+    private Context mContext;
+    private FileEncryptionPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new FileEncryptionPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_storageManagerNull_shouldBeFalse() {
+        ReflectionHelpers.setField(mController, "mStorageManager", null);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_notConvertibleToFBE_shouldBeFalse() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_convertibleToFBE_shouldBeTrue() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_settingIsNotFile_shouldDoNothing() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+        mController.displayPreference(mPreferenceScreen);
+        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "foobar");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setEnabled(anyBoolean());
+        verify(mPreference, never()).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_settingIsFile_shouldSetSummaryAndDisablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+        mController.displayPreference(mPreferenceScreen);
+        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "file");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.convert_to_file_encryption_done));
+    }
+}
+
+

diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..ecb0da5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java

@@ -0,0 +1,127 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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 GpuViewUpdatesPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private GpuViewUpdatesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new GpuViewUpdatesPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnGpuViewUpdates() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffGpuViewUpdates() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
new file mode 100644
index 0000000..09e48d3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java

@@ -0,0 +1,136 @@
+/*
+ * 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 com.android.settings.development.HardwareOverlaysPreferenceController
+        .SURFACE_FLINGER_READ_CODE;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HardwareOverlaysPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private IBinder mSurfaceFlinger;
+
+    private HardwareOverlaysPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = spy(new HardwareOverlaysPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger);
+        doNothing().when(mController).writeHardwareOverlaysSetting(anyBoolean());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOn_shouldWriteTrueToHardwareOverlaysSetting() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mController).writeHardwareOverlaysSetting(true);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOff_shouldWriteFalseToHardwareOverlaysSetting() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mController).writeHardwareOverlaysSetting(false);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingEnabled_shouldCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 1;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingDisabled_shouldUnCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 0;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceChecked_shouldTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(true);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController).writeHardwareOverlaysSetting(false);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceUnchecked_shouldNotTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(false);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController, never()).writeHardwareOverlaysSetting(anyBoolean());
+        verify(mPreference, never()).setChecked(anyBoolean());
+        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/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
new file mode 100644
index 0000000..02a5df6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java

@@ -0,0 +1,120 @@
+/*
+ * 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 com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF;
+
+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.app.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 KeepActivitiesPreferenceControllerTest {
+
+    private static final int SETTING_VALUE_ON = 1;
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IActivityManager mActivityManager;
+
+    private Context mContext;
+    private KeepActivitiesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new KeepActivitiesPreferenceController(mContext));
+        doReturn(mActivityManager).when(mController).getActivityManager();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnDestroyActivities()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mActivityManager).setAlwaysFinish(true);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffDestroyActivities()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mActivityManager).setAlwaysFinish(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mActivityManager).setAlwaysFinish(false);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
new file mode 100644
index 0000000..c698313
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java

@@ -0,0 +1,120 @@
+package com.android.settings.development;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.backup.IBackupManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LocalBackupPasswordPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private IBackupManager mBackupManager;
+
+    private Context mContext;
+    private LocalBackupPasswordPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new LocalBackupPasswordPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+    }
+
+    @Test
+    public void updateState_hasBackupPassword_preferenceShouldHavePasswordSetSummary()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.local_backup_password_summary_change);
+    }
+
+    @Test
+    public void updateState_noBackupPassword_preferenceShouldHaveNoPasswordSetSummary()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.local_backup_password_summary_none);
+    }
+
+    @Test
+    public void updateState_backupManagerIsNull_shouldDisablePreference() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", null);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference, never()).setSummary(any());
+    }
+
+    @Test
+    public void updateState_backupManagerIsNotNullAndNotAdminUser_shouldDisablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(false).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference, never()).setSummary(any());
+    }
+
+    @Test
+    public void updateState_backupManagerIsNotNullAndAdminUser_shouldEnablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference, never()).setSummary(any());
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
new file mode 100644
index 0000000..5ad0329
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java

@@ -0,0 +1,151 @@
+package com.android.settings.development;
+
+/*
+ * 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.
+ */
+
+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 android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 NotificationChannelWarningsPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+
+    private Context mContext;
+    private NotificationChannelWarningsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new NotificationChannelWarningsPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableNotificationChannelWarnings() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableNotificationChannelWarnings() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldBeChecked() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isDebuggable();
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingUndefinedDebuggingDisabled_preferenceShouldNotBeChecked() {
+        mController = spy(mController);
+        doReturn(false).when(mController).isDebuggable();
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
new file mode 100644
index 0000000..1289aec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java

@@ -0,0 +1,124 @@
+package com.android.settings.development;
+
+/*
+ * 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.
+ */
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 ResizableActivityPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private ResizableActivityPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ResizableActivityPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableResizableActivities() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableResizableActivities() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                ResizableActivityPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/ShadowParcel.java b/tests/robotests/src/com/android/settings/development/ShadowParcel.java
new file mode 100644
index 0000000..965c959
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShadowParcel.java

@@ -0,0 +1,20 @@
+package com.android.settings.development;
+
+import android.os.Parcel;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * This class provides helpers to test logic that reads from parcels.
+ */
+@Implements(Parcel.class)
+public class ShadowParcel {
+
+    static int sReadIntResult;
+
+    @Implementation
+    public int readInt() {
+        return sReadIntResult;
+    }
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
new file mode 100644
index 0000000..0a189cb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java

@@ -0,0 +1,84 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.IShortcutService;
+import android.os.RemoteException;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ShortcutManagerThrottlingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IShortcutService mShortcutService;
+
+    private Context mContext;
+    private ShortcutManagerThrottlingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ShortcutManagerThrottlingPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mShortcutService", mShortcutService);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_differentPreferenceKey_shouldReturnFalse() {
+        when(mPreference.getKey()).thenReturn("SomeRandomKey");
+
+        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_correctPreferenceKey_shouldResetThrottling()
+            throws RemoteException {
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+
+        final boolean handled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(handled).isTrue();
+        verify(mShortcutService).resetThrottling();
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
new file mode 100644
index 0000000..2eb1070
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java

@@ -0,0 +1,127 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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 ShowLayoutBoundsPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private ShowLayoutBoundsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ShowLayoutBoundsPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
index 57c4ae3..a5cfa22 100644
--- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java

@@ -31,7 +31,6 @@
 
 import android.content.Context;
 import android.os.IBinder;
-import android.os.Parcel;
 import android.os.RemoteException;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
@@ -45,8 +44,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -136,16 +133,4 @@
 
         verify(mPreference).setEnabled(true);
     }
-
-
-    @Implements(Parcel.class)
-    public static class ShadowParcel {
-
-        static int sReadIntResult;
-
-        @Implementation
-        public int readInt() {
-            return sReadIntResult;
-        }
-    }
 }

diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
new file mode 100644
index 0000000..0f839c1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java

@@ -0,0 +1,127 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.StrictMode;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class StrictModePreferenceControllerTest {
+
+    @Mock
+    private IWindowManager mWindowManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private StrictModePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new StrictModePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldTurnOnStrictMode() throws RemoteException {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mWindowManager).setStrictModeVisualIndicatorPreference(
+                StrictModePreferenceController.STRICT_MODE_ENABLED);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldTurnOffStrictMode()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mWindowManager).setStrictModeVisualIndicatorPreference(
+                StrictModePreferenceController.STRICT_MODE_DISABLED);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldTurnOffPreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final boolean isEnabled = SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY,
+                false /* default */);
+
+        assertThat(isEnabled).isFalse();
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldTurnOnPreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
new file mode 100644
index 0000000..4b7e82b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java

@@ -0,0 +1,125 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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 UsbAudioRoutingPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+
+    private UsbAudioRoutingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new UsbAudioRoutingPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_usbAudioRoutingEnabled_shouldCheckedPreference() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_usbAudioRoutingDisabled_shouldUncheckedPreference() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableUsbAudioRouting() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableUsbAudioRouting() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index 45e457b..cea3d89 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java

@@ -47,6 +47,10 @@
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * deprecated in favor of {@link VerifyAppsOverUsbPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class VerifyAppsOverUsbPreferenceControllerTest {

diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java
new file mode 100644
index 0000000..9e60295
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java

@@ -0,0 +1,211 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class VerifyAppsOverUsbPreferenceControllerV2Test {
+
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+
+    @Mock
+    private VerifyAppsOverUsbPreferenceControllerV2.RestrictedLockUtilsDelegate
+            mRestrictedLockUtilsDelegate;
+
+    private Context mContext;
+    private VerifyAppsOverUsbPreferenceControllerV2 mController;
+
+    /** Convenience class for setting global int settings. */
+    class GlobalSetter {
+        public GlobalSetter set(String setting, int value) {
+            Global.putInt(mContext.getContentResolver(), setting, value);
+            return this;
+        }
+    }
+
+    private final GlobalSetter mGlobals = new GlobalSetter();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mController = new VerifyAppsOverUsbPreferenceControllerV2(mContext);
+        ReflectionHelpers.setField(
+                mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        mController.displayPreference(mScreen);
+    }
+
+    private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
+        final List<ResolveInfo> resolveInfos = nonEmpty
+                ? Collections.singletonList(mock(ResolveInfo.class))
+                : Collections.<ResolveInfo>emptyList();
+        when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt()))
+                .thenReturn(resolveInfos);
+    }
+
+    private void setupEnforcedAdmin(EnforcedAdmin result) {
+        when(mRestrictedLockUtilsDelegate.checkIfRestrictionEnforced(
+                (Context) any(), anyString(), anyInt())).thenReturn(result);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0 /* setting disabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_adbDisabled_preferenceShouldNotBeChecked() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 0 /* setting disabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_verifierOff_preferenceShouldNotBeChecked() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_ENABLE, 0 /* setting disabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() {
+        setupVerifyBroadcastReceivers(false);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_restrictedByAdmin_preferenceShouldBeDisabled() {
+        setupVerifyBroadcastReceivers(true);
+        final EnforcedAdmin admin = new EnforcedAdmin();
+        setupEnforcedAdmin(admin);
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
+        verify(mPreference).setDisabledByAdmin(admin);
+    }
+
+    @Test
+    public void isAvailable_verifierNotVisible_shouldReturnFalse() {
+        setupVerifyBroadcastReceivers(true);
+        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0 /* setting disabled */);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_verifierVisible_shouldReturnTrue() {
+        setupVerifyBroadcastReceivers(true);
+        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1 /* setting enabled */);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableUsbVerify() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
+
+        assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableUsbVerify() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
+
+        assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldUpdateState() {
+        mController = spy(mController);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mController).updateState(mPreference);
+    }
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java
new file mode 100644
index 0000000..faeda87
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java

@@ -0,0 +1,116 @@
+/*
+ * 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.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.graphics.drawable.Drawable;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.webview.WebViewUpdateServiceWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WebViewAppPreferenceControllerV2Test {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private DefaultAppInfo mAppInfo;
+    @Mock
+    private Drawable mDrawable;
+
+    private Context mContext;
+    private WebViewAppPreferenceControllerV2 mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new WebViewAppPreferenceControllerV2(mContext));
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        ReflectionHelpers.setField(mController, "mWebViewUpdateServiceWrapper",
+                mWebViewUpdateServiceWrapper);
+        doReturn(mAppInfo).when(mController).getDefaultAppInfo();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    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
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
index 5ce21e8..08ecc9b 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java

@@ -30,6 +30,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+/**
+ * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPreferenceControllerTest {

diff --git a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
index f9eb328..ec406cd 100644
--- a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java

@@ -16,31 +16,36 @@
 
 package com.android.settings.wifi;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager.ActionListener;
 import android.os.Handler;
-
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
-
 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;
 import org.robolectric.util.ReflectionHelpers;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedAccessPointsWifiSettingsTest {
 
-    @Mock
-    private Handler mHandler;
+    @Mock private WifiManagerWrapper mockWifiManager;
+    @Mock private WifiDialog mockWifiDialog;
+    @Mock private WifiConfigController mockConfigController;
+    @Mock private WifiConfiguration mockWifiConfiguration;
+    @Mock private AccessPoint mockAccessPoint;
+    @Mock private Handler mHandler;
 
     private SavedAccessPointsWifiSettings mSettings;
 
@@ -49,6 +54,10 @@
         MockitoAnnotations.initMocks(this);
         mSettings = new SavedAccessPointsWifiSettings();
         ReflectionHelpers.setField(mSettings, "mHandler", mHandler);
+        ReflectionHelpers.setField(mSettings, "mWifiManager", mockWifiManager);
+
+        when(mockWifiDialog.getController()).thenReturn(mockConfigController);
+        when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
     }
 
     @Test
@@ -56,7 +65,6 @@
         final AccessPoint accessPoint = mock(AccessPoint.class);
         when(accessPoint.isPasspointConfig()).thenReturn(true);
         ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", accessPoint);
-        ReflectionHelpers.setField(mSettings, "mWifiManager", mock(WifiManagerWrapper.class));
 
         mSettings.onForget(null);
 
@@ -76,4 +84,18 @@
 
         verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
     }
+
+    @Test
+    public void onSubmit_shouldInvokeSaveApi() {
+        mSettings.onSubmit(mockWifiDialog);
+        verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
+    }
+    @Test
+    public void onForget_shouldInvokeForgetApi() {
+        ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mockAccessPoint);
+        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
+        mSettings.onForget(mockWifiDialog);
+        verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+    }
 }
+
commit	ae084747fc7c5f944168eab514ea1523c98546f4	[log] [tgz]
author	Fan Zhang <zhfan@google.com>	Wed Oct 04 20:11:36 2017 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Oct 04 20:11:36 2017 +0000
tree	a8129170e5da1fa82c05703ce56eefd8bb710c34
parent	1f02ca767330c39119c91b103ca07771cc9fd7eb [diff]
parent	2d1ab9a193f2a4b681d0ab20d0dbfbaf644df00e [diff]