diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b536b20..f199673 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1828,7 +1828,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.MANAGE_USB"
-                  android:theme="@style/Transparent">
+                  android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
         </activity>
 
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml
index 9c37050..8df1210 100644
--- a/res/layout/radio_with_summary.xml
+++ b/res/layout/radio_with_summary.xml
@@ -36,7 +36,7 @@
         android:ellipsize="marquee" />
 
 
-    <TextView android:id="@+android:id/summary"
+    <TextView android:id="@android:id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="4dp"
diff --git a/res/layout/usb_dialog_container.xml b/res/layout/usb_dialog_container.xml
new file mode 100644
index 0000000..e145911
--- /dev/null
+++ b/res/layout/usb_dialog_container.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="10dp"
+    android:paddingBottom="5dp">
+
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+</ScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a279f14..1d1fd0a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak net die vingerafdruksensor om jou toestel wakker te maak en te ontsluit."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Slaan vingerafdrukopstelling oor?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jy het gekies om jou vingerafdruk te gebruik as een manier om jou foon te ontsluit. As jy dit nou oorslaan, sal jy dit later moet opstel. Dit neem net \'n minuut of wat om op te stel."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Stel skermslot op"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klaar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oeps, dis nie die sensor nie"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik jou toestel se vingerafdruksensor."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Voeg nog een by"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Jy kan jou vingerafdruk nie net gebruik om jou foon te ontsluit nie, maar ook om aankope en programtoegang te magtig. "<annotation id="url">"Kom meer te wete"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Wys stelsel-UI-ontvanger"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Bykomende toestemmings"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"nog <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Net batterylaai"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dra lêers oor (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Dra foto\'s oor (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laai tans"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Laai net hierdie toestel"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Kragbron"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Laai die ander gekoppelde toestel"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Lêeroordragte"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dra lêers na Windows of Mac oor (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto-oordrag (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Dra foto\'s of lêers oor as MTP nie gesteun word nie (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gebruik toestel vir MIDI-invoer"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gebruik USB vir"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Onaktiewe programme"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Onaktief. Raak om te wissel."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Hierdie toestemming laat \'n program toe om stelselinstellings te verander."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dubbeldraai vir kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Maak die kameraprogram oop deur jou pols twee keer vinnig te draai"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8a534db..e9d41b6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"የእርስዎን መሣሪያ ለማንቃት እና ለመክፈት የጣት አሻራ ዳሳሹን ነካ ማድረግ ብቻ ይበቃዎታል።"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ይህን አዶ ሲመለከቱ የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ተከናውኗል"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"አረግ አረግ፣ አነፍናፊው ያ አይደለም"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"በመሣሪያዎ ላይ ያለውን የጣት አሻራ አነፍናፊ ይጠቀሙ።"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ሌላ ያክሉ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ቀጣይ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ስልክዎን ከማስከፈት በተጨማሪም እንዲሁም ግዢዎችን እና የመተግበሪያ መዳረሻን ለመፍቀድ የጣት አሻራዎንም መጠቀም ይችላሉ። "<annotation id="url">"ተጨማሪ ለመረዳት"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ቃኚን አሳይ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ተጨማሪ ፈቃዶች"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ተጨማሪ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ኃይል መሙላት ብቻ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ፋይሎችን ያሸጋግራል (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ፎቶዎችን ያሸጋግራል (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ኃይል በመሙላት ላይ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ይህን መሣሪያ ብቻ ኃይል ይሙሉበት"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"የኃይል አቅርቦት"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ሌላኛው የተገናኘ መሣሪያን ኃይል ይሙሉበት"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"የፋይል ዝውውሮች"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ፋይሎችን ወደ Windows ወይም Mac አዛውር (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"የፎቶ ዝውውር (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP የማይደገፍ ከሆነ ፎቶዎችን ወይም ፋይሎችን ማዛወር (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"መሣሪያን ለMIDI ግብዓት ይጠቀሙበት"</string>
     <string name="usb_use" msgid="3372728031108932425">"ዩኤስቢ ተጠቀም ለ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ንቁ ያልሆኑ መተግበሪያዎች"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ንቁ ያልሆነ። ለመቀያየር ነካ ያድርጉ።"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ይህ ፈቃድ መተግበሪያው የስርዓት ቅንብሮችን ለመቀየር ያስችለዋል።"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"አዎ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"አይ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ለካሜራ ሁለት ጊዜ ይጠምዝዙት"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"የእጅ አንጓዎን ሁለት ጊዜ በመጠምዘዝ የካሜራ መተግበሪያውን ይክፈቱ"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 676466e..60b16bf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -354,10 +354,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"لن يلزمك سوى لمس مستشعر بصمات الإصبع لتنشيط الجهاز وإلغاء قفله."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"عند رؤية هذا الرمز، يمكنك استخدام بصمة الإصبع."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"تم"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"عفوًا، هذا ليس جهاز الاستشعار"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"استخدم جهاز استشعار بصمة الإصبع على جهازك."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"إضافة بصمة إصبع أخرى"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"التالي"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"بالإضافة إلى إلغاء قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
@@ -2867,10 +2875,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"إظهار أداة ضبط واجهة مستخدم النظام"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"أذونات إضافية"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> أخرى"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"الشحن فقط"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏نقل البيانات (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏نقل الصور (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"جارٍ الشحن"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"شحن هذا الجهاز فقط"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"مصدر الطاقة"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"شحن الجهاز المتصل الآخر"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"عمليات نقل الملفات"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏نقل الملفات إلى Windows أو Mac (بروتوكول نقل الوسائط MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏نقل الصور (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏نقل الصور أو الملفات إذا لم يكن بروتوكول نقل الوسائط MTP متوفرًا (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏استخدام الجهاز مع إدخال MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استخدام USB في"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"التطبيقات غير النشطة"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غير نشط. المس للتبديل."</string>
@@ -2940,4 +2954,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"يتيح هذا الإذن للتطبيق إمكانية تعديل إعدادات النظام."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"نعم"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"لا"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"يمكنك اللف مرتين لفتح الكاميرا"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"يمكنك فتح تطبيق الكاميرا من خلال لف رسغك مرتين"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index d44f110..b015326 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu piktoqramı nə vaxtsa görsəniz, identifikasiya və ya satın almanı təsdiqləmək üçün barmaq izinizdən istifadə edə bilərsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ayılmaq və cihaz kilidini açmaq üçün sadəcə olaraq barmaq izi sensoruna toxunun."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu ikonu gördüyünüz zaman, barmaq izinizi istifadə edə bilərsiniz."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmaq izi ayarları ötürülsün?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefon kilidini açmaq üçün barmaq izindən istifadə etməyi seçmisiniz. Bunu indi ötürsəniz, bu funksiyanı daha sonra ayarlamalı olacaqsınız. Ayarlamaq bir-iki dəqiqə vaxtınızı aparacaq."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidi quraşdırın"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hazırdır"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bu sensor deyil"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda barmaq izi sensorundan istifadə edin."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Başqasını əlavə edin"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Növbəti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonun kiliddən çıxarılmasından əlavə, alışları doğrulamaq və tətbiqlərə giriş üçün barmaq izinizi də istifadə edə bilərsiniz. "<annotation id="url">"Ətraflı məlumat"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner göstərin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Əlavə icazələr"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"daha <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Yalnız enerji doldurma"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Faylların transferi (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoların transferi (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Enerji yığır"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Sadəcə bu cihazın batareyasını doldurun"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Enerji təchizatı"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Digər qoşulu cihazın batareyasını doldurun"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fayl köçürmələri"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Faylları Windows və ya Mac (MTP) cihazınıza transfer edin"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Əgər MTP dəstəklənmirsə (PTP), foto və faylları transfer edin"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI daxiletmə üçün cihaz istifadə edin"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB istifadəsi"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"İnaktiv tətbiqlər"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"İnaktiv. Keçid etmək üçün toxunun."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera üçün iki dəfə burun"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Biləyinizi iki dəfə buraraq kamera tətbiqini açın"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 985c61e..3480594 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Трябва само да докоснете сензора за отпечатъци, за да „събудите“ и отключите устройството си."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Когато видите тази икона, можете да използвате отпечатъка си."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ами сега! Това не е сензорът"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Ползвайте сензора за отпечатък на у-вото си."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавяне на друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отключване на телефона си можете да използвате отпечатъка си и за упълномощаване на покупки и достъп до приложения. "<annotation id="url">"Научете повече"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показване на тунера на системния ПИ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Допълнителни разрешения"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Още <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само за зареждане"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Прехвърляне на файлове (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Прехвърляне на снимки (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зареждане"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само за зареждане на това устройство"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Захранване"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зареждане на другото свързано устройство"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Прехвърляния на файлове"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Прехвърляне на файлове на устройство с Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Прехвърляне на снимки (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Прехвърляне на снимки или файлове, ако MTP не се поддържа (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Използване на устройството за вход за MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Използване на USB за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивни приложения"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Докоснете за превключване."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Това разрешение позволява на дадено приложение да променя системните настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Завъртане два пъти за достъп до камерата"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворете приложението Камера с двукратно завъртане на китката си"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index d22ae61..17a6f7d 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"আপনার ডিভাইসকে জাগাতে এবং আনলক করতে শুধুমাত্র আঙ্গুলের ছাপ সেন্সরে স্পর্শ করুন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"আপনি যখন এই আইকন দেখতে পাবেন তখনই আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"সম্পন্ন"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ওহো, সেটি সেন্সর ছিল না"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"আপনার ডিভাইসে আঙ্গুলের ছাপ নেওয়ার সেন্সর ব্যবহার করুন৷"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"আরেকটি জুড়ুন"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"পরবর্তী"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"উপরন্তু আপনার ফোন আনলক করতে, কেনাকাটা এবং অ্যাপ্লিকেশান অ্যাক্সেস অনুমোদন করতে আপনি আপনার আঙ্গুলের ছাপও ব্যবহার করতে পারেন৷ "<annotation id="url">"আরো জানুন"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"সিস্টেমUI টিউনার দেখান"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"অতিরিক্ত অনুমতিগুলি"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"আরো <xliff:g id="COUNT">%1$d</xliff:g>টি"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"শুধুমাত্র চার্জ করা"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ফাইলগুলির স্থানান্তর (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটোগুলির স্থানান্তর (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"চার্জ হচ্ছে"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"শুধুমাত্র ডিভাইটি চার্জ করুন"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"পাওয়ার উৎস"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"অন্যান্য সংযুক্ত ডিভাইস চার্জ করুন"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ফাইল স্থানান্তরণগুলি"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows বা Mac এ ফাইলগুলি স্থানান্তর করুন (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ফটো স্থানান্তরণ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"যদি MTP সমর্থিত না হয় তবে ফটো বা ফাইলগুলি স্থানান্তর করুন (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ইনপুটের জন্য ডিভাইস ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3372728031108932425">"এর জন্য USB ব্যবহার করুন"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"নিষ্ক্রিয় অ্যাপ্লিকেশানগুলি"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"নিষ্ক্রিয় রয়েছে৷ টগল করতে স্পর্শ করুন৷"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"এই অনুমতিটি কোনো অ্যাপ্লিকেশানকে সিস্টেম সেটিংস সংশোধন করার অনুমতি দেয়৷"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"হ্যাঁ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"না"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ক্যামেরার জন্য দুবার ঝাঁকান"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"আপনার কব্জি দুবার ঝাঁকিয়ে ক্যামেরা অ্যাপ্লিকেশানটি খুলুন"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 761fa28..3419a81 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar o per autoritzar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Toca el sensor d\'empremtes digitals per activar i desbloquejar el dispositiu."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quan vegis aquesta icona, pots fer servir la teva empremta digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Sortir de configuració d\'empremta digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has triat utilitzar la teva empremta digital per desbloquejar el telèfon. Si omets aquest pas ara, hauràs de fer aquesta configuració més endavant. Aquest procés només triga un parell de minuts."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configura el bloqueig de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fet"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Això no és el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilitza el sensor d\'empremtes del dispositiu"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne un altre"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A més de fer servir l\'empremta digital per desbloquejar el telèfon, també la pots fer servir per autoritzar compres i permetre l\'accés a determinades aplicacions. "<annotation id="url">"Més informació"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostra SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos addicionals"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> més"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Només per carregar"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir fitxers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Càrrega"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Carrega només aquest dispositiu"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Font d\'alimentació"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carrega l\'altre dispositiu connectat"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferència de fitxers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfereix fitxers al sistema Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferència de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfereix fotos o fitxers si no s\'admet MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilitza el dispositiu per a l\'entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Funcions de l\'USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicacions inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva. Toca per activar-la."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doble gir per obrir Càmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira el canell dues vegades per obrir l\'aplicació Càmera"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e38c2ff..de79742 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Probuďte a odemkněte zařízení klepnutím na senzor otisků prstů."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Když se zobrazí tato ikona, můžete použít otisk prstu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Přeskočit nastavení otisku prstu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jako jeden ze způsobů odemknutí telefonu jste se rozhodli používat otisk prstu. Pokud nastavení přeskočíte, bude třeba jej dokončit později. Nastavení trvá jen chviličku."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavit zámek obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jejda, to není senzor."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použijte senzor otisků prstů na zařízení."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Přidat další"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Další"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Kromě odemknutí telefonu můžete svůj otisk prstu použít také k autorizaci nákupů a přístupu aplikací. "<annotation id="url">"Další informace"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Zobrazit tuner SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Další oprávnění"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Počet: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pouze nabíjení"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Přenos souborů (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Přenos fotek (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nabíjení"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Nabít jen toto zařízení"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zdroj energie"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Nabít jen druhé připojené zařízení"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Přenos souborů"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Přenést soubory do systému Windows nebo Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Přenos fotek (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Přenést fotky nebo soubory, pokud MTP není podporováno (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Použít zařízení jako vstup MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Použití USB:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivní aplikace"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivní. Přepnete klepnutím."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Otevření Fotoaparátu otočením zápěstí"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Umožňuje otevřít aplikaci Fotoaparát dvojitým otočením zápěstí."</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 74aa58a..e56d1db 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tryk på fingeraftrykssensoren for at vække din enhed og låse den op."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikon, kan du bruge dit fingeraftryk."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du springe registrering af fingeraftryk over?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt at bruge fingeraftryk som en metode til at låse din telefon op. Hvis du springer det over nu, skal du konfigurere dette senere. Konfigurationen tager kun omkring et minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skærmlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Færdig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hov! Dette er ikke sensoren"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Brug fingeraftrykssensoren på din enhed."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tilføj endnu et"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Næste"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ud over at bruge fingeraftryk til at låse telefonen op kan du også bruge fingeraftryk til at godkende køb og få adgang til apps. "<annotation id="url">"Få flere oplysninger"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Vis SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Flere tilladelser"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> mere"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Udelukkende til opladning"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Til at overføre filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Til at overføre billeder (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Oplader"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplad denne enhed"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strømforsyning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Oplad den anden tilsluttede enhed"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filoverførsler"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Overfør filer til Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Billedoverførsel (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overfør billeder eller filer, hvis MTP ikke understøttes (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"Til MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Brug enheden til MIDI-indgang"</string>
     <string name="usb_use" msgid="3372728031108932425">"Brug USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Tryk for at skifte."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Drej to gange for at åbne kameraet"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Åbn kameraappen ved at dreje håndleddet to gange"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c0f80aa..b8a9592 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tippen Sie einfach auf den Fingerabdrucksensor, um Ihr Gerät zu aktivieren und zu entsperren."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck verwenden."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Fingerabdruck-Einrichtung überspringen?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Sie haben festgelegt, dass Sie unter anderem Ihren Fingerabdruck zum Entsperren Ihres Smartphones verwenden möchten. Wenn Sie diesen Schritt jetzt überspringen, müssen Sie die Einrichtung zu einem späteren Zeitpunkt vornehmen. Die Einrichtung dauert nur ca. eine Minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Displaysperre einrichten"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fertig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Das ist nicht der Sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Fingerabdrucksensor auf Gerät verwenden"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Weitere hinzufügen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Mit Ihrem Fingerabdruck können Sie nicht nur Ihr Smartphone entsperren, sondern auch Käufe und App-Zugriffe autorisieren. "<annotation id="url">"Weitere Informationen"</annotation></string>
@@ -2802,10 +2810,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI-Tuner anzeigen"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Zusätzliche Berechtigungen"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> weitere"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Nur aufladen"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dateien übertragen (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotos übertragen (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ladevorgang"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Nur zum Aufladen dieses Geräts"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Stromversorgung"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Anderes angeschlossenes Gerät aufladen"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Dateiübertragungen"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dateien an Windows oder Mac übertragen (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoübertragung (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotos oder Dateien übertragen, falls MTP nicht unterstützt wird (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gerät für MIDI-Eingabe verwenden"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB verwenden für"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive Apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Berühren zum Aktivieren."</string>
@@ -2871,4 +2885,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Zum Öffnen der Kamera zweimal drehen"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera App durch zweimaliges Drehen des Handgelenks öffnen"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b038989..dc0b9df 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Απλά αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να αφυπνίσετε και να ξεκλειδώσετε τη συσκευή σας."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Μόλις εμφανιστεί αυτό το εικονίδιο, μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Τέλος"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ωχ, αυτό δεν είναι ο αισθητήρας"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Χρήση αισθητήρα μοναδικού χαρακτ. συσκευής."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Προσθήκη άλλου"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Επόμενο"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Εκτός από τη δυνατότητα ξεκλειδώματος του τηλεφώνου σας, μπορείτε επίσης να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας, για να εξουσιοδοτήσετε αγορές και πρόσβαση σε εφαρμογές. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Εμφάνιση δέκτη SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Πρόσθετα δικαιώματα"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ακόμη"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Φόρτιση μόνο"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Μεταφορά αρχείων (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Μεταφορά φωτογραφιών (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Φόρτιση σε εξέλιξη"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Φορτίστε απλώς τη συσκευή"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Παροχή ρεύματος"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Φορτίστε την άλλη συνδεδεμένη συσκευή"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Μεταφορές αρχείων"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Μεταφορά αρχείων σε Windows ή Mac (ΜΤΡ)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Μεταφορά φωτογραφιών (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Μεταφορά φωτογραφιών ή αρχείων, εάν δεν υποστηρίζεται το MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Χρήση συσκευής για είσοδο MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Χρήση USB για"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Ανενεργές εφαρμογές"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Ανενεργή. Αγγίξτε για εναλλαγή."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Αυτή η άδεια επιτρέπει σε μια εφαρμογή την τροποποίηση των ρυθμίσεων συστήματος."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ναι"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Όχι"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Περιστρέψτε δύο φορές για κάμερα"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ανοίξτε την εφαρμογή κάμερας περιστρέφοντας δύο φορές τον καρπό σας"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 33eca2c..30fd2a1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 33eca2c..30fd2a1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 33eca2c..30fd2a1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2a592ef..29923a0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo toca el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando veas este ícono, podrás utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Omitir configuración de huella digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiste usar la huella digital como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilizar sensor de huellas digitales de disp."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Agregar otra huella digital"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
@@ -2797,10 +2805,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador de IU del sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionales"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> más"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo para realizar cargas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir archivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Realizar cargas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cargar solo este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fuente de alimentación"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Cargar el otro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferir archivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir archivos a Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos o archivos si no se admite MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar el dispositivo para la entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para lo siguiente:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicaciones inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva (toca para alternar)"</string>
@@ -2866,4 +2880,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Este permiso admite que una aplicación modifique la configuración del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Gira la muñeca dos veces para la cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación de la cámara"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index df0dd19..6f03e10 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo tienes que tocar el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando aparezca este icono, puedes utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Saltar configuración de huella digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has decidido utilizar tu huella digital para desbloquear el teléfono. Si te saltas este paso ahora, tendrás que configurarlo más tarde (este proceso tarda aproximadamente un minuto)."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"¡Vaya! Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa sensor huellas digitales del dispositivo."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Añadir otra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar acceso a aplicaciones y compras. "<annotation id="url">"Más información"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionales"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> más"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo carga"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir archivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Cargar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cargar solo este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Suministrar corriente eléctrica"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Cargar el otro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferir archivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir archivos a Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos o archivos si no se admite MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar dispositivo para entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicaciones inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva. Toca para cambiar."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doble giro para abrir la cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación Cámara"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 52f41e3..dbfb3b3 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Seadme äratamiseks ja avamiseks puudutage lihtsalt sõrmejäljelugejat."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kui näete seda ikooni, saate sõrmejälge kasutada."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kas jätta sõrmejälje seadistus vahele?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Valisite telefoni avamise üheks viisiks sõrmejälje kasutamise. Kui seadistamise praegu vahele jätate, peate seda tegema hiljem. See võtab ainult umbes minuti."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Seadista ekraanilukk"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Vabandust, see pole andur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Kasutage seadme sõrmejäljeandurit."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisa veel üks"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Järgmine"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Lisaks telefoni avamisele saate oma sõrmejälje abil volitada ka ostusid ja juurdepääsu rakendustele. "<annotation id="url">"Lisateave"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Kuva SystemUI tuuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Täiendavad load"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Veel <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Ainult laadimine"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Failide edastamine (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotode edastamine (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laadimine"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Selle seadme laadimine"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Toiteallikas"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Teise ühendatud seadme laadimine"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failide edastamine"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Failide edastamine Windowsi või Maci arvutisse (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotode edastamine (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotode või failide edastamine, kui MTP-d ei toetata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Seadme kasutamine MIDI-sisendina"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB kasutusviis"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktiivsed rakendused"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiivne. Puudutage ümberlülitamiseks."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pöörake kaks korda kaamera avamiseks"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Avage kaamerarakendus, pöörates rannet kaks korda"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 888d81a..bc3ac01 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ukitu hatz-marka digitalaren sentsorea gailua aktibatzeko eta desblokeatzeko."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hatz-markaren konfigurazioa saltatu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hatz-marka erabiltzea aukeratu duzu telefonoa desblokeatzeko modu bat gisa. Urratsa saltatzen baduzu, geroago konfiguratu beharko duzu. Minutu bat inguru baino ez duzu beharko konfiguratzeko."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguratu pantailaren blokeoa"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Eginda"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hori ez da sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Erabili gailuko hatz-marken sentsorea."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Gehitu beste bat"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Hurrengoa"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonoa desblokeatzeko ez ezik, erosketak eta aplikazioetarako sarbideak baimentzeko balio du hatz-markak. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako UI konfiguratzailea"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Baimen gehigarriak"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Beste <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Kargatzeko bakarrik"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fitxategiak transferitzeko (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Argazkiak transferitzeko (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Kargatzen"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Kargatu gailu hau soilik"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Energia-iturburua"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Kargatu konektatutako beste gailua"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fitxategi-transferentziak"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferitu fitxategiak Windows edo Mac (MTP) gailu batera"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Argazkien transferentzia (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferitu argazkiak edo fitxategiak MTP onartzen ez bada (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI modurako"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Erabili gailua MIDI sarrerarako"</string>
     <string name="usb_use" msgid="3372728031108932425">"Erabili USBa honetarako:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikazio inaktiboak"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktibo. Aldatzeko, ukitu hau."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera irekitzeko, biratu birritan"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ireki kameraren aplikazioa eskumuturra birritan biratuta"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1be8400..d78f5a6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"برای روشن کردن و باز کردن قفل دستگاهتان کافیست حسگر اثر انگشت را لمس کنید."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"وقتی این نماد را می‌بینید، می‌توانید از اثر انگشتتان استفاده کنید."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"انجام شد"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"اووه، آن حسگر نیست"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"از حسگر اثر انگشت در دستگاهتان استفاده کنید."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"افزودن مورد دیگر"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"بعدی"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"علاوه بر باز کردن قفل تلفنتان، همچنین می‌توانید از اثرانگشتتان برای اجازه دادن به خریدها و دسترسی برنامه استفاده کنید."<annotation id="url">"بیشتر بدانید"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"نمایش تنظیم‌گر واسط کاربری سیستم"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"مجوزهای بیشتر"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> مورد دیگر"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"فقط هنگام شارژ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏انتقال فایل‌ها (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏انتقال عکس‌ها (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"درحال شارژ شدن"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"فقط این دستگاه شارژ شود"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"منبع نیرو"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"دستگاه متصل دیگر شارژ شود"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"انتقال فایل"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏انتقال فایل‌ها به Windows یا Mac (‏MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏انتقال عکس (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏انتقال عکس یا فایل، اگر MTP پشتیبانی نمی‌شود (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏استفاده از دستگاه برای ورودی MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استفاده از USB برای"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"برنامه‌های غیرفعال"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غیرفعال. برای تغییر حالت لمس کنید."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"این مجوز به برنامه امکان می‌دهد تنظیمات سیستم را تغییر دهد."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"بله"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"خیر"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"دو بار بچرخانید تا دوربین باز شود"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"با دو بار چرخاندن مچتان، برنامه دوربین را باز کنید"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 65dd5af..df9e48e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Voit avata laitteesi lukituksen koskettamalla sormenjälkianturia."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Voit käyttää sormenjälkeäsi, kun tämä kuvake on näkyvissä."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ohitetaanko sormenjäljen määritys?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Olet valinnut sormenjäljen yhdeksi tavaksi avata puhelimesi lukitus. Jos ohitat tämän nyt, sinun on määritettävä se myöhemmin. Määritys kestää vain noin minuutin."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ota näytön lukitus käyttöön"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hups, anturi ei ole siinä."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Käytä laitteen sormenjälkianturia."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisää toinen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seuraava"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Puhelimen lukituksen avaamisen lisäksi voit käyttää sormenjälkeä ostoksien ja sovelluksien käyttöoikeuksien vahvistamiseen. "<annotation id="url">"Lisätietoja"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Näytä SystemUI-viritin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Lisäkäyttöoikeudet"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lisää"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Vain lataus"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Tiedostojen siirtäminen (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuvien siirtäminen (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Akun lataus"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Lataa vain tämä laite."</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Virtalähde"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Lataa toinen liitetty laite."</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Tiedostojen siirto"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Siirrä tiedostoja Windowsille tai Macille (MTP)."</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Valokuvien siirto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Siirrä valokuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Käytä laitetta MIDI-äänitulona."</string>
     <string name="usb_use" msgid="3372728031108932425">"Käytä USB:tä:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Epäaktiiviset sovellukset"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Epäaktiivinen. Ota käyttöön tai poista käytöstä koskettamalla."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kaksoiskääntäminen kameraa varten"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Avaa kamerasovellus kääntämällä rannettasi kahdesti"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 27321f6..0c9b384 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque vous voyez cette icône, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration plus tard. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurer le verrouil. de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminé"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oups, ce n\'est pas le capteur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez capteur empreinte dig. sur appareil."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une ligne"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afficher les paramètres SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorisations supplémentaires"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> autre(s)"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charge seulement"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfert de fichiers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charge en cours..."</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Charger cet appareil seulement"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Source de courant"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charger l\'autre appareil connecté"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferts de fichiers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transférer des fichiers vers Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferer des photos ou des fichiers si MTP n\'est pas pris en charge (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utiliser un appareil pour l\'entrée MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour :"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Applications inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactif. Touchez pour changer l\'état."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pivot. poignet deux fois pour app. photo"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f2aff89..9bf74e0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration ultérieurement. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"OK"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Petit problème… Il ne s\'agit pas du capteur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez capteur empreinte dig. sur appareil."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afficher l\'adaptateur de l\'IU système"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorisations supplémentaires"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> autres"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charge uniquement"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transférer des fichiers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charger"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Uniquement pour charger cet appareil"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Source d\'alimentation"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charger l\'autre appareil connecté"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transférer des fichiers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transférer des fichiers vers Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transférer des photos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transférer des photos ou des fichiers si MTP n\'est pas compatible (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utiliser l\'appareil pour l\'entrée MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Applications inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Application inactive. Appuyez ici pour l\'activer."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double rotation pour l\'appareil photo"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application Appareil photo en faisant pivoter votre poignet deux fois."</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index d0d1f74..727c28c 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa impresión dixital para a identificación ou para autorizar unha compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Simplemente toca o sensor de impresións dixitais para activar e desbloquear o teu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cando vexas esta icona, podes usar a túa impresión dixital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omitir configuración impresión dixital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiches usar a túa impresión dixital para desbloquear o teu teléfono. Se omites este paso agora, terás que configuralo máis tarde. Non tardarás máis dun minuto en facelo."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo da pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Feito"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Iso non é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utiliza o sensor de impresión dixital."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engadir outro"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ademais de desbloquear o teu teléfono, tamén podes utilizar a túa impresión dixital para autorizar compras e o acceso a aplicacións. "<annotation id="url">"Máis información"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador da IU do sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> máis"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Só durante a carga"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir ficheiros (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Cargando"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Só carga o dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentación"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carga outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferencias de ficheiros"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfire ficheiros a Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferencia de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferencia de fotos ou ficheiros se MTP non é compatible (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usa o dispositivo para a entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicacións inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Aplicación inactiva. Toca para activala."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dobre xiro para abrir a cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Xira o pulso dúas veces para abrir a aplicación da cámara"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 5f3d794..e9e990d 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"જ્યારે પણ તમે આ આઇકન જુઓ, તમે ઓળખ માટે અથવા ખરીદી અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"તમારા ઉપકરણને સક્રિય કરવા અને અનલૉક કરવા માટે માત્ર ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"જ્યારે તમે આ આયકન જુઓ, ત્યારે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"થઈ ગયું"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ઓહ, તે સેન્સર નથી"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"તમારા ઉપકરણ પર ફિંગરપ્રિન્ટ સેન્સરનો ઉપયોગ કરો."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"બીજી ઉમેરો"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"આગલું"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"તમારા ફોનને અનલૉક કરવા ઉપરાંત, તમે ખરીદીઓ અને એપ્લિકેશન અ‍ૅક્સેસને અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો પણ ઉપયોગ કરી શકો છો. "<annotation id="url">"વધુ જાણો"</annotation></string>
@@ -2801,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ટયુનર બતાવો"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"વધારાની પરવાનગીઓ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> વધુ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"માત્ર ચાર્જીંગ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ફાઇલો ટ્રાન્સફર કરો (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટા ટ્રાન્સફર કરો (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ચાર્જિંગ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"બસ આ ઉપકરણને ચાર્જ કરો"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"પાવર સપ્લાય"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"અન્ય કનેક્ટ થયેલ ઉપકરણોને ચાર્જ કરો"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ફાઇલ સ્થાનાંતરણ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows અથવા Mac પર ફાઇલો સ્થાનાંતરિત કરો (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ફોટો સ્થાનાંતરણ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટા અથવા ફાઇલો સ્થાનાંતરિત કરો (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ઇનપુટ માટે ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3372728031108932425">"આ માટે USB નો ઉપયોગ કરો"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"નિષ્ક્રિય એપ્લિકેશનો"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"નિષ્ક્રિય. ટોગલ કરવા માટે ટચ કરો."</string>
@@ -2870,4 +2884,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"આ પરવાનગી એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપે છે."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"હા"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"નહીં"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"કૅમેરા માટે બે વાર મરડો"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા એપ્લિકેશન ખોલો"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5e583d0..81f9c3d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"जब आपको यह आइकन दिखाई दे, तो आप अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह संवेदक नहीं है"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट संवेदक का उपयोग करें."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई अन्‍य जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दिखाएं"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतियां"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> और"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"केवल चार्जिंग"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फ़ाइलों का स्थानांतरण (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का स्थानांतरण (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज हो रहा है"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"केवल इस डिवाइस को चार्ज करें"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ऊर्जा की आपूर्ति"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"अन्य कनेक्ट किए गए डिवाइस को चार्ज करें"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फ़ाइल ट्रांसफर"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"फ़ाइलों को Windows या Mac (MTP) पर ट्रांसफर करें"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"फ़ोटो ट्रांसफर (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP समर्थित नहीं होने पर फ़ोटो या फ़ाइलें ट्रांसफर करें (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुट के लिए डिवाइस का उपयोग करें"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB का उपयोग इसके लिए करें"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय ऐप्स"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय. टॉगल करने के लिए स्पर्श करें."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"यह अनुमति किसी ऐप को सिस्टम सेटिंग बदलने देती है."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हां"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नहीं"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"कैमरे के लिए दो बार मोड़ना"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"अपनी कलाई को दो बार मोड़कर कैमरा ऐप खोलें"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7029994..8a3af3f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Jednostavno dodirnite senzor otiska prsta da biste aktivirali i otključali uređaj."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kada vidite ovu ikonu, možete upotrijebiti otisak prsta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Odlučili ste se za otisak prsta kao jedan od načina za otključavanje telefona. Ako sad preskočite, morat ćete ga postaviti kasnije. Postavljanje traje samo otprilike jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Upotrijebite senzor otiska prsta na uređaju."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj drugo"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Kupnje i pristup aplikacija možete osim otključavanjem telefona autorizirati i otiskom prsta. "<annotation id="url">"Saznajte više"</annotation></string>
@@ -2816,10 +2824,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Prikaži Prijamnik kor. suč."</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatna dopuštenja"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Još <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Samo punjenje"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Prijenos datoteka (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prijenos fotografija (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Punjenje"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo punjenje uređaja"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Napajanje"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Punjenje drugog povezanog uređaja"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prijenosi datoteka"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prijenos datoteka na Windows ili Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prijenos fotografija (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prijenos fotografija i datoteka ako MTP nije podržan (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Upotreba uređaja za MIDI ulaz"</string>
     <string name="usb_use" msgid="3372728031108932425">"Svrha upotrebe USB-a"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivno. Dodirnite za prebacivanje."</string>
@@ -2886,4 +2900,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko obrtanje za fotoaparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvaranje aplikacije fotoaparata obrtanjem ručnog zgloba dvaput"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 575513b..d5dffef 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Csak érintse meg az ujjlenyomat-érzékelőt az eszköz felébresztéséhez és feloldásához."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ha ezt az ikont látja, használhatja ujjlenyomatát."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Átugorja az ujjllenyomat-beállítást?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Kiválasztotta, hogy ujjlenyomattal is feloldhassa telefonját. Ha most kihagyja a lépéseket, később kell majd beállítania a funkciót. Ez hozzávetőlegesen 1 percet vesz igénybe."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Képernyőzár beállítása"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kész"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppá! Az nem az érzékelő"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Használja az eszköz ujjlenyomat-érzékelőjét."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Még egy hozzáadása"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Következő"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A telefon feloldásán kívül az ujjlenyomattal a vásárlásokat és az alkalmazások hozzáféréseit is engedélyezheti. "<annotation id="url">"További információ"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Kezelőfelület-hangoló megjelenítése"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"További engedélyek"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> további"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Csak töltés"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fájlok átvitele (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotók átvitele (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Töltődik"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Csak töltse az eszközt"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Töltés"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Töltse a másik csatlakoztatott eszközt"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fájlátvitel"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Fájlok átvitele Windows rendszerre vagy Mac típusú számítógépekre (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotóátvitel (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotók vagy fájlok átvitele, ha az MTP nem támogatott (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Eszköz használata MIDI-bemenethez"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB használata a következő célra:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktív alkalmazások"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktív: A váltáshoz érintse meg."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"A kamera eléréshez forgassa kétszer a csuklóját"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Nyissa meg a Fényképezőgép alkalmazást kétszeri csuklófordítással"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index 13b8a1a..c9681cf 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"Փոքր"</item>
     <item msgid="1932071435506638315">"Սովորական"</item>
     <item msgid="38373998008112077">"Մեծ"</item>
-    <item msgid="7786168277516233536">"Վիթխարի"</item>
+    <item msgid="7786168277516233536">"Հսկայական"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Շատ դանդաղ"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index c7190f9..301567f 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել ձեր մատնահետքը՝ նույնականացում կատարելու կամ գնումը թույլատրելու համար:"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Սարքը քնի ռեժիմից հանելու և ապակողպելու համար պարզապես հպեք մատնահետքի սենսորին:"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Մատնահետքը կարող եք օգտագործել ամեն անգամ, երբ ցուցադրվում է այս պատկերակը:"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Պատրաստ է"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Դա սենսորը չէ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Օգտագործեք մատնահետքի սենսորը:"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ավելացնել այլ մատնահետք"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Բացի հեռախոսը ապակողպելուց՝ մատնահետքը կարող եք նաև օգտագործել գնումները հաստատելու և հավելվածներից օգտվելու համար: "<annotation id="url">"Մանրամասն"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Ցուցադրել Համակարգի ՕՄ-ի կարգավորիչը"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Լրացուցիչ թույլտվություններ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Եվս <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Միայն լիցքավորման"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Ֆայլերի փոխանցման (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցման (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Լիցքավորում"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Պարզապես այս սարքի լիցքավորում"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Հոսանքի սնուցում"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Այլ կապակցված սարքի լիցքավորում"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Ֆայլերի փոխանցումներ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Ֆայլերի փոխանցում Windows-ին կամ Mac-ին (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Լուսանկարի փոխանցում (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Լուսանկարների կամ ֆայլերի փոխանցում, եթե MTP-ն չի աջակցվում (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Սարքի օգտագործում MIDI ներածման համար"</string>
     <string name="usb_use" msgid="3372728031108932425">"Օգտագործել հետևյալ USB կապակցումը՝"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Միացրած հավելվածներ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Անջատված: Հպեք՝ փոխարկելու համար:"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Միացնելով այս թույլտվությունը՝ թույլ եք տալիս հավելվածին փոփոխել համակարգի կարգավորումները:"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Այո"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ոչ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Տեսախցիկի բացում կրկնակի պտտման միջոցով"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Տեսախցիկի բացում դաստակի կրկնակի պտտման միջոցով"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f9051f4..f70b4ee 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cukup sentuh sensor sidik jari untuk membangunkan dan membuka kunci perangkat."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Jika melihat ikon ini, Anda dapat menggunakan sidik jari."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Lewati penyiapan sidik jari?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan sidik jari sebagai satu cara untuk membuka kunci perangkat. Jika dilewati sekarang, Anda harus menyiapkannya nanti. Penyiapan hanya memerlukan waktu sekitar satu menit."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Siapkan kunci layar"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bukan itu sensornya"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan sensor sidik jari di perangkat."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tambahkan yang lain"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Berikutnya"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Selain membuka kunci ponsel, Anda juga dapat menggunakan sidik jari untuk mengotorisasi pembelian dan akses aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Tampilkan Penyetel SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Izin tambahan"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lainnya"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Hanya untuk pengisian daya"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Mengisi daya"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Isi daya perangkat ini saja"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Pasokan daya"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Isi daya perangkat lain yang terhubung"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transfer file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer file ke Windows atau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfer foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer foto atau file jika MTP tidak didukung (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gunakan perangkat untuk masukan MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikasi yang tidak aktif"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Tidak aktif. Sentuh untuk mengalihkan."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Putar dua kali untuk kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b543833..ad3089e 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Snertu einfaldlega fingrafaraskynjarann til að taka tækið úr biðstöðu og lás."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Þegar þú sérð þetta tákn geturðu notað fingrafarið."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Viltu sleppa uppsetningu fingrafars?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Þú hefur valið að nota fingrafar þitt sem leið til að opna símann þinn. Ef þú sleppir þessu núna þarftu að setja þetta upp seinna. Uppsetningin tekur einungis um eina mínútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Setja upp skjálás"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Lokið"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Úbbs, þetta er ekki skynjarinn"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Notaðu fingrafaraskynjarann á tækinu."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Bæta öðru við"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Áfram"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Auk þess að taka símann úr lás geturðu notað fingrafarið til að heimila kaup og aðgang að forritum. "<annotation id="url">"Frekari upplýsingar"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Sýna fínstillingar kerfisviðmóts"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Viðbótarheimildir"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> í viðbót"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Hleðslu eingöngu"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Skráaflutning (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Myndaflutning (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Í hleðslu"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Bara hlaða þetta tæki"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Rafmagn"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Hlaða hitt tengda tækið"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Skráaflutningur"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Flytja skrár yfir í Windows eða Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Myndaflutningur (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Flytja myndir eða skrár ef MTP er ekki stutt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Nota tæki fyrir MIDI-inntak"</string>
     <string name="usb_use" msgid="3372728031108932425">"Nota USB fyrir"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Óvirk forrit"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Óvirkt. Snertu til að breyta."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Tvöfaldur snúningur fyrir myndavél"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Opnaðu myndavélarforritið með því að snúa úlnliðnum tvisvar"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fd0e08b..db9faf6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tocca il sensore delle impronte digitali per riattivare e sbloccare il dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vedi questa icona, significa che puoi utilizzare l\'impronta digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Saltare configurazione impronta digitale?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hai scelto anche l\'utilizzo dell\'impronta digitale tra i vari metodi per sbloccare il telefono. Se salti la configurazione ora, dovrai eseguirla in un secondo momento. Basta un minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Imposta blocco schermo"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fine"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, questo non è il sensore"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa sensore impronte digitali su dispositivo."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Aggiungine un\'altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Oltre che per sbloccare il telefono, puoi utilizzare la tua impronta digitale per autorizzare acquisti e accessi alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostra SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Altre autorizzazioni"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Altre <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo per la ricarica"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Trasferisci file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferisci foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ricarica"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Solo per la ricarica del dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Alimentazione"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ricarica l\'altro dispositivo connesso"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Trasferimenti di file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Trasferisci file su Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Trasferimento di foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Trasferisci foto o file se la modalità MTP non è supportata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizza il dispositivo per l\'ingresso MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizza connessione USB per"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"App non attive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Non attiva. Tocca per attivare."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doppia rotazione per fotocamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4e74576..48034a81 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"סיום"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"אופס. זה לא החיישן הנכון"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"השתמש בחיישן טביעת האצבע במכשיר."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"הוסף עוד"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, תוכל להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"‏הצג את SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"הרשאות נוספות"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"עוד <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"טעינה בלבד"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏העברת קבצים (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏העברת תמונות (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"טעינה"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"רק לטעינת המכשיר"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"מקור חשמל"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"הטען את המכשיר האחר המחובר"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"העברות קבצים"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏העבר קבצים אל Windows או Mac ‏(MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏העברת תמונות (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏העברת תמונות או קבצים אם MTP אינו נתמך (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏השתמש במכשיר לקלט MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏השתמש ב-USB בשביל"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"אפליקציות לא פעילות"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"לא פעילה. גע כדי להחליף."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"סיבוב כפול להפעלת המצלמה"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"פתח את אפליקציית המצלמה על ידי סיבוב כפול של פרק כף היד"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4a5b23d..f7276f0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"このアイコンが表示されている場合は指紋を利用できます。"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は1分程度です。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"画面ロックを設定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完了"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"これはセンサーではありません"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"端末の指紋センサーを使用してください。"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"別の指紋を登録"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"スマートフォンのロック解除に加えて、指紋認証を使用して購入やアプリのアクセスを許可することもできます。"<annotation id="url">"詳細"</annotation></string>
@@ -2805,10 +2813,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI調整ツールを表示"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"その他の権限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"他<xliff:g id="COUNT">%1$d</xliff:g>件"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"充電のみ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ファイルの転送（MTP）"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真の転送（PTP）"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"この端末の充電のみを行う"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"接続されている他のデバイスを充電する"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ファイル転送"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"WindowsまたはMacへファイルを転送する（MTP）"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"写真の転送（PTP）"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"写真を転送またはMTPがサポートされない場合にファイルを転送する（PTP）"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"端末をMIDI入力に使用する"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBの使用"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"無効なアプリ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"無効。タップすると切り替わります。"</string>
@@ -2874,4 +2888,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"この権限により、アプリはシステム設定の変更ができるようになります。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不可"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"2回ひねる動作でカメラアプリを開く"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"手首を2回ひねる動作でカメラアプリを開きます"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 5596aae..eb01258 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"უბრალოდ, შეეხეთ თითის ანაბეჭდის სენსორს თქვენი მოწყობილობის გამოსაღვიძებლად და განსაბლოკად."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"როდესაც ამ ხატულას დაინახავთ, შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"შესრულდა"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"უფს, ეს არ არის სენსორი"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"თითის ანაბეჭდ. სენსორის მოწყობ.-ზე გამოყენება"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"კიდევ ერთის დამატება"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"შემდეგი"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"თქვენი ტელეფონის განბლოკვასთან ერთად, ასევე შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი შესყიდვებისა და აპების წვდომის დასამოწმებლად. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ტუნერის ჩვენება"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"დამატებითი ნებართვები"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> სხვა"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"მხოლოდ დამუხტვა"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ფაილების გადაცემისთვის (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ფოტოების გადაცემისთვის (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"მიმდინარეობს დატენვა"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"უბრალოდ დამუხტეთ ეს მოწყობილობა"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"დენის მიწოდება"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"სხვა დაკავშირებული მოწყობილობის დამუხტვა"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ფაილის გადატანა"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"გადაიტანეთ ფაილები Windows ან Mac (MTP)-ში"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"სურათის გადატანა (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"გადაიტანეთ ფოტოები ან ფაილები, თუ MTP არ არის მხარდაჭერილი (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"გამოიყენეთ მოწყობილობა MIDI შეყვანისთვის"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ს გამოყენება"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"უმოქმედო აპები"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"უმოქმედო. შეეხეთ გადასართავად."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ეს ნებართვა უფლებას აძლევს აპს, შეცვალოს სისტემის პარამეტრები."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"კი"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"არა"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ორმაგი მოტრიალება კამერისთვის"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"გახსენით კამერის აპი თქვენი მაჯის ორჯერ მოტრიალებით"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 25659b5..e1ecda8 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Құрылғыны ояту және құлпын ашу үшін жай саусақ ізі сенсорын түртіңіз."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Осы белгішені көргенде саусақ ізін пайдалануға болады."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Дайын"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, бұл сенсор емес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Құрылғ.саусақ таңбасы сенсорын пайдаланыңыз."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Басқасын қосу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Келесі"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Саусақ ізімен телефон бекітпесін ашып қана қоймай, сонымен қатар тауар сатып алғаныңызды және қолданбаны пайдалануға рұқсатыңыз бар екенін растау үшін пайдалануға болады. "<annotation id="url">"Толығырақ"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Жүйе пайд. интерфейсінің тюнерін көрсету"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Қосымша рұқсаттар"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Тағы <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Тек зарядтау"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Файлдарды тасымалдау (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Фотосуреттерді тасымалдау (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зарядталуда"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Тек осы құрылғыны зарядтау"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Қуат көзі"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Басқа жалғанған құрылғыны зарядтау"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файлдарды тасымалдаулар"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Файлдарды Windows немесе Mac жүйесіне тасымалдау (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Фотосурет тасымалдау (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP қолдауы жоқ болса (PTP), фотосуреттерді немесе файлдарды тасымалдау"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Құрылғыны MIDI кірісі үшін пайдалану"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB пайдалану мақсаты"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Белсенді емес қолданбалар"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Белсенді емес. Ауыстыру үшін түртіңіз."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Иә"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жоқ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Камера үшін екі рет бұру"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Білекті екі рет бұру арқылы камера қолданбасын ашу"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 25a9d3a..430f433 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីធ្វើជាអត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"គ្រាន់តែប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃដើម្បីដាស់ និងដោះសោឧបករណ៍របស់អ្នក។"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃរបស់អ្នក។"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"រួចរាល់"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"អូ នោះមិនមែនជាឧបករណ៍ចាប់សញ្ញាទេ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ប្រើឧបករណ៍ចាប់សញ្ញាម្រាមដៃនៅលើឧបករណ៍របស់អ្នក។"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បន្ថែមផ្សេងទៀត"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"បន្ទាប់"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"បន្ថែមលើការដោះសោទូរស័ព្ទរបស់អ្នក អ្នកក៏អាចប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីផ្តល់សិទ្ធិលើការចូលប្រើការទិញ និងកម្មវិធី។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"បង្ហាញឧបករណ៍ចាប់ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"សិទ្ធិអនុញ្ញាតបន្ថែម"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ទៀត"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"បញ្ចូលថ្មប៉ុណ្ណោះ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"បញ្ជូនឯកសារ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"បញ្ជូនរូបថត (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"បញ្ចូលថ្ម"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"គ្រាន់តែបញ្ចូលថ្មឧបករណ៍នេះ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ការផ្គត់ផ្គង់ថាមពល"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"បញ្ចូលថ្មឧបករណ៍ដែលភ្ជាប់ផ្សេងទៀត"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ផ្ទេរឯកសារ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ផ្ទេរឯកសារទៅ Windows ឬ Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ផ្ទេររូបថត (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ផ្ទេររូបថត ឬឯកសារ ប្រសិនបើមិនគាំទ្រ MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"មីឌី"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ប្រើឧបករណ៍សម្រាប់បញ្ចូលមីឌី"</string>
     <string name="usb_use" msgid="3372728031108932425">"ប្រើ USB ដើម្បី"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"កម្មវិធីដែលអសកម្ម"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"អសកម្ម។ ប៉ះដើម្បីបិទ/បើក។"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"សិទ្ធិអនុញ្ញាតនេះអនុញ្ញាតឲ្យកម្មវិធីកែការកំណត់ប្រព័ន្ធ។"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"បាទ/ចាស"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ទេ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"បង្វិលពីរដងដើម្បីប្រើកាមេរ៉ា"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"បើកកម្មវិធីកាមេរ៉ាដោយបង្វិលកដៃរបស់អ្នកពីរដង"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8f467d7..08feb54 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಎಚ್ಚರಗೊಳಿಸಲು ಮತ್ತು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಕೇವಲ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ಈ ಐಕಾನ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಬಹುದು."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ಮುಗಿದಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ಓಹ್, ಅದು ಸೆನ್ಸಾರ್ ಅಲ್ಲ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಬಳಸಿ."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ಇನ್ನೊಂದನ್ನು ಸೇರಿಸಿ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ಮುಂದೆ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡುವುದಕ್ಕೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಅನ್ನು ಕೂಡಾ ನೀವು ಬಳಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ಟ್ಯೂನರ್ ತೋರಿಸು"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ಹೆಚ್ಚುವರಿ ಅನುಮತಿಗಳು"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ಇನ್ನಷ್ಟು"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ಚಾರ್ಜ್‌ ಮಾಡುವುದಕ್ಕೆ ಮಾತ್ರ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ಫೋಟೋಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ವಿದ್ಯುತ್ ಪೂರೈಕೆ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ಇತರ ಸಂಪರ್ಕ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ಫೈಲ್ ವರ್ಗಾವಣೆಗಳು"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows ಅಥವಾ Mac (MTP) ಗೆ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ಫೋಟೋ ವರ್ಗಾವಣೆ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ಒಂದು ವೇಳೆ MTP ಬೆಂಬಲಿಸದೇ ಹೋದಲ್ಲಿ ಫೋಟೋಗಳೂ ಅಥವಾ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ಇನ್‌ಪುಟ್‌ಗೆ ಸಾಧನವನ್ನು ಬಳಸಿ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ಇದಕ್ಕಾಗಿ USB ಬಳಸಿ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ನಿಷ್ಕ್ರಿಯ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ. ಟಾಗಲ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ಹೌದು"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ಇಲ್ಲ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ಕ್ಯಾಮರಾಗೆ ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ನಿಮ್ಮ ಮಣಿಕಟ್ಟನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸುವ ಮೂಲಕ ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a8b6238..7208256 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"기기의 대기 모드 및 잠금을 해제하려면 지문 센서를 터치하기만 하면 됩니다."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"이 아이콘이 표시되면 지문을 사용할 수 있습니다."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 1분 정도 소요됩니다."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"화면 잠금 설정"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"완료"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"죄송합니다. 센서가 아닙니다."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"기기에서 지문 센서를 사용합니다."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"다른 지문 추가"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"다음"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"지문 파일은 휴대전화의 잠금 해제뿐 아니라 구매 및 앱 액세스를 승인하는 데 사용할 수 있습니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI 튜너 표시"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"추가 권한"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g>개 더보기"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"충전 전용"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"파일 전송(MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"사진 전송(PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"충전 중"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"이 기기만 충전"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"전원 공급장치"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"연결된 다른 기기 충전"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"파일 전송"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"파일을 Windows 또는 Mac에 전송(MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"사진 전송(PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP가 지원되지 않는 경우 사진 또는 파일 전송(PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI 입력에 기기 사용"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 사용"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"비활성 앱"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"비활성 상태입니다. 전환하려면 터치하세요."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"이 권한은 앱이 시스템 설정을 수정하도록 허용합니다."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"예"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"아니요"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"손목을 두 번 돌려 카메라 열기"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"손목을 두 번 돌리면 카메라 앱이 열립니다."</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index de0a399..ec3a86d 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул сөлөкөттү качан көрсөңүз да аныктоо же сатып алууга уруксат берүү үчүн манжа изиңизди пайдалана аласыз."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Түзмөгүңүздү ойготуп, кулпусун ачуу үчүн, жөн гана манжа изи сенсоруна тийип коюңуз."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Бул сөлөкөттү көргөнүңүздө манжа изиңизди колдонсоңуз болот."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Даяр"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, ал сенсор эмес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Түзмөгүңүздөгү манжа изи сенсорун колдонуңуз."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Дагы бирди кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Телефонуңуздун кулпусун ачуу, ар кандай нерселерди сатып алуу жана колдонмолорду ачуу үчүн, манжа изиңизди кошуп коюңуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner\'ди көрсөтүү"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Кошумча уруксаттар"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Дагы <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Кубаттоо үчүн гана"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Файлдарды өткөрүү (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Сүрөттөрдү өткөрүү (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Кубатталууда"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Жөн гана бул түзмөктү кубаттоо"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Кубат булагы"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Туташып турган башка түзмөктү кубаттоо"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файл өткөрүү"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Файлдарды Windows же Mac (MTP) тутумуна өткөрүү"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Сүрөт өткөрүү (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Эгер MTP колдоого алынбаса, сүрөттөрдү же файлдарды өткөрүү (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Түзмөктү MIDI киргизүү үчүн колдонуу"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB төмөнкү үчүн колдонулсун:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Иштебеген колдонмолор"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Иштеген жок. Которуу үчүн тийип коюңуз."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ооба"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жок"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Колду эки айлантып камераны ачуу"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Колуңузду эки айлантып, камера колдонмосун ачыңыз"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b5505d0..5e3e32d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ພຽງ​ແຕ່​ສຳ​ຜັດ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື ເພື່ອ​ກະ​ຕຸ້ນ ແລະ ປົດ​ລັອກ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ເມື່ອ​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄດ້."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ແລ້ວໆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ອຸ້ຍ, ນັ້ນ​ບໍ່​ແມ່ນ​ເຊັນ​ເຊີ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ໃຊ້​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ເພີ່ມ​ອັນ​ອື່ນ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ຕໍ່​ໄປ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ນອກ​ຈາກ​ການ​ປົດ​ລັອກ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ແລ້ວ, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້​ມື​ຂອງ​ທ່ານ ​ເພື່ອ​ໃຊ້​ສິດ​ໃນ​ການ​ຊື້ ແລະ​ການ​ເຂົ້າ​ຫາ​ແອັບ​ໄດ້ນຳ​ອີກ "<annotation id="url">"ຮຽນ​ຮູ້​ເພີ່ມ​ເຕີມ"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"ສະ​ແດງ​ຕົວ​ປັບ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ການ​ອະ​ນຸ​ຍາດ​​ເພີ່ມ​ເຕີມ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ເພີ່ມ​ເຕີມ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ການ​ສາກ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ໂອນ​ໄຟ​ລ໌ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ໂອນ​ຮູບ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ກຳລັງສາກໄຟ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ຫາ​ກໍ່​ສາກ​ອຸ​ປະ​ກອນ​ນີ້"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ການ​ຈ່າຍ​ໄຟ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ສາກ​ອຸ​ປະ​ກອນ​ເຊື່ອມ​ຕໍ່​ອື່ນ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ການ​ໂອນ​ໄຟ​ລ໌"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ໂອນ​ໄຟ​ລ໌​ໄປ​ຫາ Windows ຫຼື Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ການ​ໂອນ​ຮູບ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ໂອນ​ຮູບ ຫຼື ໄຟ​ລ໌ ຖ້າ MTP ບໍ່​ໄດ້​ຮອງ​ຮັບ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ໃຊ້​ອຸ​ປະ​ກອນ​ສຳ​ລັບ​ການ​ປ້ອນ MIDI ເຂົ້າ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ໃຊ້ USB ສຳ​ລັບ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ແອັບ​ບໍ່​ໃຊ້​ງານ​ຢູ່"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ບໍ່​ໃຊ້​ງານ​ຢູ່. ສຳ​ພັດ​ເພື່ອ​ສະ​ຫຼັບ."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ການ​ອະ​ນຸ​ຍາດ​ນີ້​ອະ​ນຸ​ຍາດໃຫ້​ແອັບດັດ​ແປງ​ການ​ຕັ້ງ​ຄ່າ​ລະ​ບົບ​ໄດ້."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"​ແມ່ນ​ແລ້ວ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ບໍ່"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ບິດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ເປີດ​ກ້ອງ​ຖ່າຍ​ຮູບ​ໂດຍ​ການ​ບິດ​ຂໍ້​ມື​ຂອງ​ທ່ານ​ສອງ​ຄັ້ງ"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index feb9e33..1d47fbb 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti kontrolinį kodą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tiesiog palieskite kontrolinio kodo jutiklį, kad pažadintumėte ir atrakintumėte įrenginį."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kai pamatysite šią piktogramą, galėsite naudoti kontrolinį kodą."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Praleisti pirštų atspaudų nustatymą?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nustatyti ekrano užraktą"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Atlikta"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oi, tai ne jutiklis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Naudokite įrenginio kontrolinio kodo jutiklį."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridėti kitą"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Kitas"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Naudodami kontrolinį kodą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
@@ -2835,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Rodyti sistemos NS derinimo priemonę"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Papildomi leidimai"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Dar <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tik įkrovimas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Perkelti failus (MPP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Perkelti nuotraukas (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Įkrovimas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Įkrauti tik šį įrenginį"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Maitinimo šaltinis"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Įkrauti kitą prijungtą įrenginį"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failų perkėlimai"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Perkelti failus į „Windows“ ar „Mac“ kompiuterį (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Nuotraukų perkėlimas (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Perkelti nuotraukas ar failus, jei MTP nepalaikomas (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Naudoti įrenginį – MIDI įvestis"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB naudojimas"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktyvios programos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktyvi. Palieskite, kad perjungtumėte."</string>
@@ -2906,4 +2920,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dukart pasukti, kad fotoap. pr. būtų at."</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Atidarykite fotoaparato programą dukart pasukę riešą"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 31da1fd..3ab479f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Pieskarieties pirkstu nospiedumu sensoram, lai aktivizētu un atbloķētu savu ierīci."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kad redzat šo ikonu, varat izmantot pirkstu nospiedumu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Izlaist pirksta nospieduma iestatīšanu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jūs izvēlējāties pirksta nospiedumu kā vienu no tālruņa atbloķēšanas iespējām. Ja izlaidīsiet šo darbību, iestatīšana būs jāveic vēlāk. Iestatīšanai nepieciešama aptuveni viena minūte."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Iestatīt ekrāna bloķēšanu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gatavs"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Tas nav sensors!"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Izmantojiet nospieduma sensoru uz ierīces."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pievienot citu"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tālāk"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Papildus tālruņa atbloķēšanai varat izmantot arī pirksta nospiedumu, lai autorizētu pirkumus un lietotņu piekļuvi. "<annotation id="url">"Uzziniet vairāk"</annotation>"."</string>
@@ -2816,10 +2824,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Rādīt sistēmas saskarnes regulatoru"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Papildu atļaujas"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Vēl <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tikai uzlāde"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Failu pārsūtīšana (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoattēlu pārsūtīšana (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Uzlāde"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Tikai šīs ierīces uzlāde"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strāvas padeve"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Otras pievienotās ierīces uzlāde"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failu pārsūtīšana"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Failu pārsūtīšana uz Windows vai Mac datoru (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoattēlu pārsūtīšana (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotoattēlu vai failu pārsūtīšana, ja MTP nav pieejams (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Izmantot ierīci MIDI ievadei"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB savienojuma lietošana"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktīvās lietotnes"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Lietotne nav aktīva. Pieskarieties, lai pārslēgtu."</string>
@@ -2886,4 +2900,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pagriešana divreiz kameras atvēršanai"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Atvērt kameras lietotni, divreiz pagriežot plaukstas locītavu"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-mcc505/bools.xml b/res/values-mcc505/bools.xml
new file mode 100644
index 0000000..274841d
--- /dev/null
+++ b/res/values-mcc505/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<resources>
+    <!-- Whether none security option is hide or not  (country specific). -->
+    <bool name="config_hide_none_security_option">true</bool>
+</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 78de4a4..3426fde 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само допрете го сензорот за отпечатоци за да го разбудите и отклучите уредот."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Кога ќе ја видите иконава, може да го користите отпечатокот."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, тоа не е сензорот"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користи сензор за отпечаток на уредот."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додај друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отклучување на телефонот, отпечатокот може да го користите и за да авторизирате купувања и да пристапувате до апликации. "<annotation id="url">"Дознајте повеќе"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Прикажи SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Дополнителни дозволи"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Уште <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само за полнење"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Пренос на датотеки (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Пренос на фотографии (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Се полни"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само полни го уредов"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Напојување"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Полни го другиот поврзан уред"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Преноси на датотеки"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Пренесувај датотеки на Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Пренос на фотографии (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Пренесувај фотографии или датотеки ако не е подржан MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"МИДИ"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Користи го уредот за MIDI-влез"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи УСБ за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивни апликации"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Допрете за префрлање."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Оваа дозвола овозможува апликацијата да менува поставки на системот."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Завртете двапати за камерата"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Завртете го зглобот двапати за да ја отворите апликација за камера"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 4ea2c44..4b150d1 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"നിങ്ങളുടെ ഉപകരണം ഉണർത്താനും അൺലോക്കുചെയ്യാനും വിരലടയാള സെൻസറിൽ തൊട്ടാൽ മതിയാകും."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ഈ ഐക്കൺ കാണുമ്പോൾ, നിങ്ങൾക്ക് വിരലടയാളം ഉപയോഗിക്കാനാകും."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"പൂർത്തിയായി"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ക്ഷമിക്കണം, അത് സെൻസർ അല്ല"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസർ ഉപയോഗിക്കുക."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"മറ്റൊന്ന് ചേർക്കുക"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"അടുത്തത്"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതുകൂടാതെ, വാങ്ങലുകളും അപ്ലിക്കേഷൻ ആക്‌സസ്സും അംഗീകരിക്കാൻ നിങ്ങൾക്ക് വിരലടയാളം ഉപയോഗിക്കാനുമാകും. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ട്യൂണർ കാണിക്കുക"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"അധിക അനുമതികൾ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> എണ്ണം കൂടി"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ചാർജ്ജിംഗ് മാത്രം"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ഫയലുകൾ കൈമാറുക (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ഫോട്ടോകൾ കൈമാറുക (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ചാർജ്ജുചെയ്യുന്നു"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ഈ ഉപകരണം ചാർജുചെയ്താൽ മാത്രം മതി"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"പവർ സപ്ലെ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ബന്ധിപ്പിച്ചിട്ടുള്ള രണ്ടാമത്തെ ഉപകരണം ചാർജുചെയ്യുക"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ഫയൽ കൈമാറ്റങ്ങൾ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows-ലേക്കോ Mac-ലേക്കോ ഫയലുകൾ കൈമാറുക (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ഫോട്ടോ കൈമാറുക (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP പിന്തുണയ്ക്കുന്നില്ലെങ്കിൽ ഫോട്ടോകളോ ഫയലുകളോ കൈമാറുക (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ഇൻപുട്ടിനായി ഉപകരണം ഉപയോഗിക്കുക"</string>
     <string name="usb_use" msgid="3372728031108932425">"ഇതിനായി USB ഉപയോഗിക്കുക"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"നിഷ്‌ക്രിയ ആപ്പ്‌സ്"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"നിഷ്‌ക്രിയം. ടോഗിൾ ചെയ്യാൻ സ്‌പർശിക്കുക."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കുന്നതിന് ഒരു ആപ്പിനെ ഈ അനുമതി അനുവദിക്കുന്നു."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"അതെ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ഇല്ല"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ക്യാമറയ്ക്കായി രണ്ടുതവണ തിരിക്കുക"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"നിങ്ങളുടെ കൈത്തണ്ട രണ്ടുപ്രാവശ്യം തിരിച്ചുകൊണ്ട് ക്യാമറാ ആപ്പ് തുറക്കുക"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6e2e5a1..9b84418 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирсэн тохиолдолд та өөрийн хурууны хээг оруулах эсвэл худалдан авалт хийх зөвшөөрөл олгох боломжтой болох юм."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Утсаа сэрээх, түгжээг тайлахдаа хурууны хээ мэдрэгчид хүрээрэй."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Энэ тэмдэг гарахад хурууны хээгээ оруулна."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Үйлдлийг гүйцэтгэсэн байна"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Уучлаарай, энэ мэдрэгч биш байна"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Төхөөрөмж дээрээ хурууны хээ мэдрэгчээ ашиглана уу"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Өөрийг нэмэх"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Дараах"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Хурууны хээгээ ашиглан утасны түгжээг нээхээс гадна, худалдан авалт хийж, апп-д нэвтэрч болно. "<annotation id="url">"Дэлгэрэнгүй мэдээлэл"</annotation></string>
@@ -2787,10 +2795,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner харуулах"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Нэмэлт зөвшөөрөл"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> бусад"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Зөвхөн цэнэглэх"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Дамжуулах файл (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Дамжуулах зураг (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Цэнэглэж байна"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Энэ төхөөрөмжийг л цэнэглэх"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Эрчим хүчний хангамж"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Бусад холбосон төхөөрөмжийг цэнэглэх"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файл шилжүүлэх"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows эсвэл Mac (MTP) рүү файл шилжүүлэх"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Зураг шилжүүлэх (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP дэмждэггүй бол зураг, файл илгээх (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI оролтод төхөөрөмжийг ашиглах"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ыг ашиглах"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Идэвхгүй апп-ууд"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Идэвхгүй. Сэлгэхийн тулд хүрнэ үү."</string>
@@ -2856,4 +2870,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Энэ нь апп-д системийн тохиргоог өөрчлөхийг зөвшөөрдөг."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Тийм"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Үгүй"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Камер нээхийн тулд бугуйгаа 2 удаа эргүүлэх"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын апп-ыг нээгээрэй"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 34be658..47a5212 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"आपले डिव्‍हाइस सक्रिय आणि अनलॉक करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"आपण हे चिन्ह पाहता तेव्‍हा, आपण आपले फिंगरप्रिंट वापरू शकता."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"आपल्या डिव्हाइसवर फिंगरप्रिंट सेन्सर वापरा."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"दुसरे जोडा"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"पुढील"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"आपला फोन अनलॉक करण्‍याव्यतिरिक्त, आपण आपल्या फिंगरप्रिंटचा वापर खरेदी आणि अ‍ॅप प्रवेश प्रमाणित करण्‍यासाठी देखील करू शकता. "<annotation id="url">"अधिक जाणून घ्‍या"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दर्शवा"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"केवळ चार्जिंग"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फायली स्थानांतरित करा (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फोटो स्थानांतरित करा (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज होत आहे"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"फक्त हे डिव्‍हाइस चार्ज करा"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"उर्जा पुरवठा"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"इतर कनेक्‍ट केलेले डिव्‍हाइस चार्ज करा"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फाईल स्‍थानांतरण"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows किंवा Mac (MTP) वर फायली स्थानांतरित करा"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"फोटो स्थानांतरण (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP (PTP) समर्थित नसल्‍यास फोटो किंवा फायली स्थानांतरित  करा"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुटसाठी डिव्‍हाइस वापरा"</string>
     <string name="usb_use" msgid="3372728031108932425">"यासाठी USB वापरा"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय अ‍ॅप्स"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय. टॉगल करण्‍यासाठी स्पर्श करा."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टीम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"होय"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नाही"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"कॅमेर्‍यासाठी दोनदा वळवा"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3d36374..536c934 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Sentuh sahaja penderia cap jari untuk membangunkan dan membuka kunci peranti anda."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Anda boleh menggunakan cap jari setiap kali ikon ini kelihatan."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Langkau persediaan cap jari?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan cap jari sebagai satu cara untuk membuka kunci telefon anda. Jika anda melangkaui sekarang, anda perlu menyediakannya kemudian. Persediaan hanya mengambil sedikit masa."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Sediakan kunci skrin"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Op, itu bukan penderia"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan penderia cap jari pada peranti anda."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tambah yang lain"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seterusnya"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Selain membuka kunci telefon anda, anda boleh menggunakan cap jari untuk membenarkan pembelian dan akses apl juga. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Tunjukkan Penala SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Kebenaran tambahan"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lagi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pengecasan sahaja"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Pindahkan fail (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Pindahkan foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Mengecas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cas sahaja peranti ini"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Bekalan kuasa"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Caskan peranti tersambung yang lain"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Pemindahan fail"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Memindahkan fail ke Windows atau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Pemindahan foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Pindahkan foto atau fail jika MTP tidak disokong (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gunakan peranti untuk input MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apl yang tidak aktif"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Tidak aktif. Sentuh untuk menogol."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pusing dua kali untuk membuka kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Buka apl kamera dengan memusingkan pergelangan tangan anda dua kali"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 1650256..1adbc39 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤကိုယ်စားပြုရုပ်ပုံကို သင်တွေ့တိုင်း၊  သက်သေခံခြင်းအတွက်သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုရန်အတွက် သင့်လက်ဗွေရာကို အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"သင်၏ ကိရိယာကို နှိုးပေးရန် နှင့် သော့ဖွင့်ရန် လက်ဗွေ အာရုံခံ ကိရိယာကို ထိလိုက်ရုံပါပဲ။"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"သင်သည် ဤအိုင်ကွန်ကို မြင်သောလျှင်၊ သင်သည် သင်၏ လက်ဗွေကို သုံးနိုင်သည်။"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ပြီးပါပြီ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"အိုး။ ဒါ အာရုံခံကိရိယာမဟုတ်ဘူး"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"သင့်ရဲ့ စက်ကိရိယာပေါ်တွင် လက်ဗွေအာရုံခံစက်ကိုအသုံးပြုပါ။"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"အခြား ကြော်ငြာ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"နောက်တစ်ခု"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"သင့်ဖုန်းကို သော့ဖွင့်ရန်အပြင်၊ သင်သည်သင့်လက်ဗွေကို ဝယ်ယူမှုများနှင့် အပ်ဖ်အသုံးပြုခွင့်ကို ခွင့်ပြုရန် အသုံးပြုနိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner ပြရန်"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ထပ်တိုး ခွင့်ပြုချက်များ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"နောက်ထပ် <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"အားသွင်းရန် အတွက်သာ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ဖိုင်များ လွှဲပြောင်းရန် (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းရန် (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"အားသွင်းနေ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ဒီဖုန်းကို အားသွင်းရုံပါ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ပါဝါ ဆက်သွယ်မှု"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ချိတ်ဆက်ထားသည့် အခြား device ကို အားသွင်းရန်"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ဖိုင် လွှဲပြောင်းမှုများ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ဖိုင်များကို Windows သို့မဟုတ် Mac (MTP) ထံ လွှဲပြောင်းရန်"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ဓာတ်ပုံ လွှဲပြောင်းမှု (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ကို မပံ့ပိုးလျှင် (PTP) ဓာတ်ပုံများ သို့မဟုတ် ဖိုင်များကို လွှဲပြောင်းရန်"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ထည့်သွင်းမှု အတွက် ကိရိယာကို သုံးရန်"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB သုံးပါ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"အလုပ်မလုပ်သော app များ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"အလုပ်မလုပ်ပါ။ ခလုတ်ကို ထိပါ။"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ဤခွင့်ပြုချက်သည် အပ်ဖ်ကို စနစ်ချိန်ညှိချက်များအား ပြန်ပြင်ခွင့်ပေးသည်။"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ဟုတ်"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"မလို"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ကင်မရာအတွက် နှစ်ကြိမ် လှည့်ပါ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"သင့်လက်ကိုနှစ်ကြိမ်လှည့်ခြင်းဖြင့် ကင်မရာအပ်ဖ်ကို ဖွင့်ပါ"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 358fbd8..2852d0b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Bare trykk på fingeravtrykksensoren for å vekke og låse opp enheten din."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du hoppe over fingeravtrykk-konfig.?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt å bruke fingeravtrykket ditt som én måte å låse opp telefonen din på. Hvis du hopper over konfigureringen nå, må du fullføre den senere. Konfigureringen tar bare et par minutter."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skjermlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Ferdig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, det er ikke sensoren"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Bruk fingeravtrykksensoren på enheten."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Legg til ett til"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Neste"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"I tillegg til å låse opp telefonen din, kan du bruke fingeravtrykket ditt til å godkjenne kjøp og apptilgang. "<annotation id="url">"Finn ut mer"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Vis SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Flere tillatelser"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> til"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Bare lading"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Overfør filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Overfør bilder (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Lader"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Bare lad enheten"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strømforsyning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Lading av den andre tilkoblede enheten"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filoverføring"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Filoverføring til Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Bildeoverføring (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overføring av bilder eller filer hvis MTP ikke er støttet (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Bruk MIDI-inngang for enheten"</string>
     <string name="usb_use" msgid="3372728031108932425">"Bruk USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive apper"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Trykk for slå av/på."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Vri to ganger for å åpne kameraet"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Åpne kameraappen ved å vri to ganger på håndleddet"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 717a6c4..e473e53 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस आइकन जहिले देख्नुहुन्छ, तपाईं पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"जगाउन र तपाईँको यन्त्रलाई अनलक गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्।"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"तपाईँले यो आइकन देखेको बेला तपाईँ आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"सम्पन्न भयो"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"आच्यौं, त्यो सेन्सर होईन नि त"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"तपाईँको यन्त्रमा फिंगरप्रिन्ट सेन्सर प्रयोग गर्नुहोस्।"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"अर्को थप्नुहोस्"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"अर्को"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"तपाईँले आफ्नो फोन खोल्नका अतिरिक्त खरिद र अनुप्रयोग पहुँच प्राधिकरण गर्नका लागि पनि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner देखाउनुहोस्"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतिहरू"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> थप"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"चार्ज गर्नका लागि मात्र"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फाइलहरू (MTP) स्थानान्तरण गर्नुहोस्"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"तस्बिरहरु (PTP) स्थानान्तरण गर्नुहोस्"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज हुँदै"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"केवल यो उपकरण चार्ज गर्नुहोस्"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"विद्युत आपूर्ति"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"अर्को जडान भएको उपकरण चार्ज गर्नुहोस्"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फाइल ट्रान्सफर"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows वा म्याक  Mac (MTP) मा फाइलहरू ट्रान्सफर गर्नुहोस्"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"तस्विर ट्रान्सफर (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"यदि MTP ले (PTP) समर्थित गर्दैन भने तस्विर वा फाइलहरू ट्रान्सफर गर्नुहोस्"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुटका लागि उपकरण प्रयोग गर्नुहोस्"</string>
     <string name="usb_use" msgid="3372728031108932425">"का लागि USB प्रयोग गर्नुहोस्"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय अनुप्रयोगहरू"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय। टगल गर्न छुनुहोस्।"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"यस अनुमतिले अनुप्रयोगलाई प्रणाली सेटिङहरू परिमार्जन गर्न दिन्छ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हो"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"होइन"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"क्यामेराका लागि दुई पटक बटार्नुहोस्"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"दुई पटक आफ्नो नारी बटारेर क्यामेरा अनुप्रयोग खोल्नुहोस्"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a5da156..9a13436 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak de vingerafdruksensor aan om je apparaat te activeren en te ontgrendelen."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer dit pictogram wordt weergegeven, kun je je vingerafdruk gebruiken."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Instellen van vingerafdruk overslaan?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Je hebt ervoor gekozen je vingerafdruk te gebruiken als manier om je telefoon te ontgrendelen. Als je dit nu overslaat, moet je het later instellen. Het instellen neemt ongeveer een minuut in beslag."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Schermvergrendeling instellen"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gereed"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Dat is niet de sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik de vingerafdruksensor op je apparaat."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Nog een toevoegen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Behalve voor het ontgrendelen van je telefoon kun je je vingerafdruk ook gebruiken voor het autoriseren van aankopen en app-toegang. "<annotation id="url">"Meer informatie"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner weergeven"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Aanvullende rechten"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Nog <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Alleen opladen"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Bestanden overzetten (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Foto\'s overzetten (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Opladen"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Dit apparaat gewoon opladen"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Stroomvoorziening"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Het andere verbonden apparaat opladen"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Bestandsoverdracht"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Bestanden overzetten naar Windows of Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto-overdracht (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Foto\'s of bestanden overzetten als MTP niet wordt ondersteund (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Apparaat voor MIDI-invoer gebruiken"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB gebruiken voor"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactieve apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactief. Tik om te schakelen."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Twee keer draaien voor camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open de camera-app door je pols twee keer te draaien"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index e54dc2d..7f22cb0 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਇੱਕ ਖ਼ਰੀਦ ਦਾ ਅਧਿਕਾਰ ਦੇਣ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡਿਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਛੋਹਵੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ਜਦੋਂ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ਸੰਪੂਰਣ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ਓਹੋ, ਉਹ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ਆਪਣੀ ਡਿਵਾਈਸ \'ਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਦਾ ਉਪਯੋਗ ਕਰੋ।"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ਕੋਈ ਹੋਰ ਜੋੜੋ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅਗਲਾ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਐਕਸੈਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ਟਿਊਨਰ ਦਿਖਾਓ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ਅਤਿਰਿਕਤ ਅਨੁਮਤੀਆਂ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ਹੋਰ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ਸਿਰਫ ਚਾਰਜਿੰਗ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫੋਟੋਆਂ ਨੂੰ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ਚਾਰਜਿੰਗ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ਕੇਵਲ ਇਸ ਜੰਤਰ ਨੂੰ ਚਾਰਜ ਕਰੋ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ਬਿਜਲੀ ਸਪਲਾਈ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ਹੋਰ ਜੁੜੀਆਂ ਡਿਵਾਈਸਾਂ ਨੂੰ ਚਾਰਜ ਕਰੋ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ਫਾਈਲ ਤਬਾਦਲਾ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows ਜਾਂ ਮੈਕ (MTP) ਨੂੰ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ਫੋਟੋ ਤਬਾਦਲਾ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ ਜੇਕਰ MTP (PTP) ਨੂੰ ਸਹਿਯੋਗ ਨਹੀਂ ਕਰਦਾ"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ਇੰਪੁੱਟ ਲਈ ਡਿਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ਇਸ ਲਈ USB ਦਾ ਉਪਯੋਗ ਕਰੋ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ਕਿਰਿਆਸ਼ੀਲ ਐਪਸ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ਅਕਿਰਿਆਸ਼ੀਲ। ਟੌਗਲ ਕਰਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ।"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਅਨੁਮਤੀ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ਕੈਮਰੇ ਲਈ ਦੋ ਵਾਰ ਮੋੜੋ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ਆਪਣੇ ਗੁੱਟ ਨੂੰ ਦੋ ਵਾਰ ਮੋੜਕੇ ਕੈਮਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 80d552b..96d1b14 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Za każdym razem, gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby potwierdzić swoją tożsamość lub autoryzować zakup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotknij czytnika linii papilarnych, by wybudzić i odblokować urządzenie."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ta ikona oznacza, że możesz użyć odcisku palca."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pominąć konfigurację odcisku palca?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Chcesz odblokowywać telefon m.in. odciskiem palca. Jeśli nie skonfigurujesz tej funkcji teraz, musisz to zrobić później. Zajmie Ci to około minuty."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Skonfiguruj blokadę ekranu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotowe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nie jest czytnik"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Użyj czytnika linii papilarnych w urządzeniu."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj kolejny"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Odcisk palca pozwala nie tylko odblokowywać telefon, ale też autoryzować zakupy i dostęp do aplikacji. "<annotation id="url">"Więcej informacji"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Pokaż kalibrator SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatkowe uprawnienia"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> więcej"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tylko ładowanie"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Przesyłanie plików (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesyłanie zdjęć (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ładowanie"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Tylko ładowanie tego urządzenia"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zasilacz"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ładowanie drugiego podłączonego urządzenia"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Przesyłanie plików"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Przesyłanie plików do systemu Windows lub Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Przesyłanie zdjęć (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Przesyłanie zdjęć lub plików, jeśli MTP nie jest obsługiwane (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Używaj urządzenia jako wejścia MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Użyj USB do:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Nieaktywne aplikacje"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Nieaktywna. Kliknij, by włączyć."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dwukrotny obrót otwiera aparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otwórz aplikację aparatu, obracając dwukrotnie nadgarstkiem"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9c4e0fa..cf62474 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permissões adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Carregamento apenas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir arquivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de arquivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir arquivos para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou arquivos se o MTP não for compatível (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usar dispositivo para entrada de MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apps inativos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativo. Toque para alternar."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4a8c5ef..858b9db 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressões digitais para ativar e desbloquear o dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vir este ícone, pode utilizar as impressões digitais."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorar configur. de impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Optou por utilizar a sua impressão digital como uma forma de desbloquear o telemóvel. Se ignorar agora, terá de configurar esta opção mais tarde. A configuração demora apenas alguns minutos."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar o bloqueio de ecrã"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, isso não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilize o sensor de impr. digit. no seu disp."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Para além de desbloquear o telemóvel, também pode utilizar a sua impressão digital para autorizar compras e o acesso de aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorizações adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Apenas carregamento"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir ficheiros (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregamento"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Apenas carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo ligado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de ficheiros"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir ficheiros para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou ficheiros se o MTP não for suportado (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar o dispositivo para entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicações inativas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativa. Toque para ativar."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Torção dupla para a câmara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir a aplicação de câmara ao torcer o dispositivo no seu pulso"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9c4e0fa..cf62474 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permissões adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Carregamento apenas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir arquivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de arquivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir arquivos para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou arquivos se o MTP não for compatível (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usar dispositivo para entrada de MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apps inativos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativo. Toque para alternar."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0927e32..61f9a1b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă vă puteți folosi amprenta pentru autentificare sau pentru a autoriza o achiziție."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ca să activați și să deblocați dispozitivul, este suficient să atingeți senzorul pentru amprentă."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Când vedeți această pictogramă, vă puteți folosi amprenta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omiteți configurarea amprentei?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ați ales ca amprenta să fie una dintre modalitățile de deblocare a telefonului. Dacă omiteți acum această etapă, va trebui să o configurați mai târziu. Configurarea durează în jur de un minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurați blocarea ecranului"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminat"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hopa, acela nu este senzorul"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Folosiți senzorul de amprentă pe dispozitiv."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adăugați altă amprentă"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Înainte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Pe lângă deblocarea telefonului, vă puteți folosi amprenta pentru a autoriza achizițiile și accesul aplicațiilor. "<annotation id="url">"Aflați mai multe"</annotation></string>
@@ -2817,10 +2825,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afișați Tunerul SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisiuni suplimentare"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Încă <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Doar la încărcare"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferați fișiere (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferați fotografii (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Încărcare"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Doar încarcă acest dispozitiv"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Sursă de energie"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Încărcați celălalt dispozitiv conectat"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferuri de fișiere"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferați fișiere în Windows sau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfer de fotografii (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferați fotografii sau fișiere dacă MTP nu este acceptat (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Folosiți dispozitivul pentru intrarea MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Folosiți conexiunea USB pentru"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicații inactive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactivă. Atingeți pentru a comuta."</string>
@@ -2887,4 +2901,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Două răsuciri pentru camera foto"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Deschideți aplicația Cameră foto răsucind din încheietura mâinii de două ori"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0d3bb5a..daa67bb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Чтобы разблокировать устройство, приложите палец к сканеру."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Этот значок сообщает, что вы можете использовать отпечаток пальца."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Мимо! Это не сканер отпечатков пальцев..."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Он точно есть на устройстве. Найдите его!"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавить"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далее"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Добавьте отпечаток пальца, чтобы только вы смогли разблокировать телефон, совершать покупки и открывать приложения. "<annotation id="url">"Подробнее…"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показать SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ещё разрешения"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Ещё <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Только зарядка"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Передача файлов (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Передача фото (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зарядка"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Просто зарядка устройства"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Источник питания"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зарядка другого подключенного устройства"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Передача файлов"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Передача файлов на компьютер Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Передача фото (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Передача фотографий или файлов, если МТР не поддерживается (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Использование MIDI-входа на устройстве"</string>
     <string name="usb_use" msgid="3372728031108932425">"Использование USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивные приложения"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Нажмите для переключения."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Приложение сможет изменять системные настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Нет"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Включать камеру движением запястья"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Чтобы открыть приложение \"Камера\", дважды поверните запястье."</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c2653e6..a9f6603 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ඔබේ උපාංගය අවදි කර අගුලු හැරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ඔබ මෙම අයිකනය දකින විට, ඔබට ඔබේ ඇඟිලි සලකුණ භාවිත කළ හැකිය."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"නිමයි"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"අපොයි, එය සංවේදකය නොවෙයි"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ඔබගේ උපාංගයේ ඇති ඇඟිලි සලකුණු සංවේදකය භාවිත කරන්න."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"තවත් එකක් එක් කරන්න"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"මීළඟ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ඔබේ දුරකථනය අගුලු හැරීමට අමතරව, ඔබට ඔබේ ඇඟිලි සලකුණ මිලදී ගැනීම් සහ යෙදුම් ප්‍රවේශ සත්‍යාපනය සඳහාද භාවිත කළ හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
@@ -2801,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI සුසරකය පෙන්වන්න"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"අතිරේක අවසර"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"තවත් <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ආරෝපණය පමණි"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ගොනු හුවමාරුව (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ඡායාරූප හුවමාරුව (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ආරෝපණය වෙමින්"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"මෙම උපාංගය දැන් ආරෝපනය කරන්න"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"බල සැපයුම"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"වෙනත් සම්බන්ධිත උපාංග ආරෝපනය කරන්න"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ගොනු මාරු"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows හෝ Mac (MTP) වෙත ගොනු මාරු කරන්න"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ඡායාරූප හුවමාරුව (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP සහාය නොදක්වන්නේනම් ඡායාරූප හෝ ගොනු මාරු කරන්න (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ආදානය සඳහා උපාංගය භාවිත කරන්න"</string>
     <string name="usb_use" msgid="3372728031108932425">"පහත සඳහා USB භාවිතා කරන්න"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"අක්‍රිය යෙදුම්"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"අක්‍රියයි. ටොගල කිරීමට ස්පර්ශ කරන්න."</string>
@@ -2870,4 +2884,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"මෙම අවසරය යෙදුමකට පද්ධති සැකසීම් විකරණය කිරීමට ඉඩ දෙයි."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ඔව්"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"නැත"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"කැමරාව සඳහා දෙවරක් කරකවන්න"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ඔබේ මැණික් කටුව දෙවරක් කරකවා කැමරා යෙදුම විවෘත කරන්න"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 163e311..ed86f36 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ak chcete prebudiť a odomknúť svoje zariadenie, stačí sa dotknúť senzora odtlačkov prstov."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Keď uvidíte túto ikonu, môžete použiť odtlačok prsta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiť nastavenie odtlačkov prstov?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vybrali ste, že chcete používať odtlačok prsta ako jeden zo spôsobov odomknutia telefónu. Ak tento krok preskočíte, budete musieť odtlačok nastaviť neskôr. Trvá to približne minútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastaviť zámku obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ojoj, to nie je senzor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použite senzor odtlačku prsta na zariadení."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridať ďalší"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku autorizovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Zobraziť tuner SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ďalšie povolenia"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Počet ďalších povolení: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Iba na nabíjanie"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"prenos súborov (MTP),"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"prenos fotiek (PTP)."</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nabíja sa"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Iba nabiť toto zariadenie"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zdroj napájania"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Nabiť ďalšie pripojené zariadenie"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prenosy súborov"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prenos súborov do systému Windows alebo počítača Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prenos fotiek (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotiek alebo súborov, keď nie je podporovaný protokol MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"pripojenie zariadenia MIDI,"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Použiť zariadenie pre vstup MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Použiť rozhranie USB na"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktívne aplikácie"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktívna. Zapnete ju klepnutím."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Fotoaparát – dvakrát pokrúťte zápästím"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorte aplikáciu fotoaparátu tak, že dvakrát pokrútite zápästím"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be151eb..b742e20 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotaknite se tipala za prstne odtise, da preklopite napravo iz stanja pripravljenosti in jo odklenete."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ko je prikazana ta ikona, lahko uporabite prstni odtis."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Želite preskočiti nast. prstnega odtisa?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Za odklepanja telefona ste izbrali možnost prstnega odtisa. Če zdaj preskočite, boste to morali nastaviti pozneje. Nastavitev traja samo približno eno minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavi zaklepanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Končano"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to ni tipalo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Uporabite tipalo prstnih odtisov na napravi."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj še enega"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Prstni odtis lahko uporabljate za odklepanje zaslona ter potrjevanje nakupov in dostop do aplikacij. "<annotation id="url">"Več o tem"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Prikaži sprejemnik upor. vmes. sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatna dovoljenja"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Še <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Samo za polnjenje"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Prenos datotek (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenos fotografij (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Polnjenje"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo polnjenje akumulatorja naprave"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Napajanje"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Polnjenje druge povezane naprave"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prenos datotek"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prenos datotek v sistem Windows ali Mac OS (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prenos fotografij (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotografij ali datotek, če MTP ni podprt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Uporaba naprave za izhod MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Uporaba povezave USB za"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivno. Dotaknite se za preklop."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dvakratno sukanje za fotoaparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Odprite aplikacijo za fotografiranje, tako da dvakrat zasukate zapestje"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index c118901..4f21753 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sa herë që shikon këtë ikonë, mund të përdorësh gjurmën e gishtit për identifikim ose për të autorizuar një blerje."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Mjafton të prekësh sensorin e gjurmës së gishtit për të zgjuar dhe shkyçur pajisjen."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kur të shohësh këtë ikonë, mund të përdorësh gjurmën e gishtit."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kapërce konfigurimin e gjurmës së gishtit?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ke zgjedhur që të përdorësh gjurmën e gishtit si një mënyrë për ta shkyçur telefonin. Nëse e kapërcen teni, do të duhet ta konfigurosh këtë më vonë. Konfigurimi do të zgjasë vetëm afro një minutë."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguro kyçjen e ekranit"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"U krye"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jo, sensori nuk është ai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Përdor sensorin e gjurmës së gishtit në pajisje."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Shto një tjetër"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Përpara"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Përveç shkyçjes së telefonit, gjurmën e gishtit mund ta përdorësh edhe për të autorizuar blerjet dhe qasjen në aplikacione. "<annotation id="url">"Mëso më shumë"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Shfaq sintonizuesin SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Lejet shtesë"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> të tjera"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Vetëm për ngarkim"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferimin e skedarëve (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferimin e fotografive (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Po ngarkohet"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vetëm karikoje këtë pajisje"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Furnizim me energji"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Kariko pajisjen tjetër të lidhur"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferimet e dosjeve"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfero dosjet në Windows ose Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferim fotosh (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfero foto ose dosje, nëse MTP-ja nuk mbështetet (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Përdor pajisjen për hyrjen MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Përdore USB-në për"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikacionet joaktive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Joaktiv. Preke për ta ndryshuar."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Rrotullo dy herë për kamerën"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Hap aplikacionin e kamerës duke rrotulluar kyçin e dorës dy herë"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 52f6085..5181671 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само додирните сензор за отисак прста да бисте активирали и откључали уређај."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Када видите ову икону, можете да користите отисак прста."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, то није сензор"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користите сензор за отисак прста на уређају."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додајте још један"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Даље"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Осим за откључавање телефона, отисак прста можете да користите и да бисте дали овлашћење за куповине и приступ апликацијама. "<annotation id="url">"Сазнајте више"</annotation></string>
@@ -2816,10 +2824,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Прикажи Тјунер за кор. интерфејс система"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Додатне дозволе"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"још <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само пуњење"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Пренос датотека (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Пренос слика (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Пуњење"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само пуните овај уређај"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Напајање"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Пуните други повезани уређај"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Пренос датотека"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Преносите датотеке на Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Пренос слика (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Преносите слике или датотеке ако MTP није подржан (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Користите уређај за MIDI улаз"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи USB за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивне апликације"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивна. Додирните да бисте је активирали."</string>
@@ -2886,4 +2900,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ова дозвола дозвољава апликацији да мења подешавања система."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Двапут заокрените за камеру"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворите апликацију Камера тако што ћете двапут заокренути ручни зглоб"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9ab9918..4e313ab 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Väck och lås upp enheten genom att trycka på fingeravtryckssensorn."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"När den här ikonen visas kan du använda fingeravtryck."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hoppa över fingeravtryckskonfigurering?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valt att låsa upp mobilen med hjälp av ditt fingeravtryck. Om du hoppar över konfigureringen nu måste du slutföra den senare. Konfigureringen tar bara en minut eller två."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ställ in skärmlåset"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppsan! Det där är inte sensorn"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Använd fingeravtryckssensorn på enheten."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lägg till en till"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Nästa"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Förutom att låsa upp mobilen kan du använda fingeravtrycket för att godkänna köp och åtkomst för appar. "<annotation id="url">"Läs mer"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Visa inställningar för systemgränssnitt"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ytterligare behörigheter"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> till"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Endast laddning"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Överföring av filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Överföring av foton (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laddar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Ladda bara den här enheten"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strömförsörjning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ladda den andra anslutna enheten"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filöverföringar"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Överföra filer till Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoöverföring (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Överföra foton eller filer om MTP inte stöds (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Använd enheten för MIDI-indata"</string>
     <string name="usb_use" msgid="3372728031108932425">"Använd USB för"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktiva appar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Aktivera genom att trycka."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Två handledsvridningar öppnar kameran"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Öppna kameran med två handledsvridningar"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 186fb3f..8b3519b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -348,10 +348,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kihisi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ukiona aikoni hii, unaweza kutumia alama yako ya kidole."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ungependa kuruka kusanidi kitambulisho?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Umechagua kutumia kitambulisho kama njia ya kufungua simu yako. Ukiruka sasa, utahitajika kusanidi hii baadaye. Usanidi huchukua takriban dakika moja."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Weka mbinu ya kufunga skrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Nimemaliza"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Lo, hicho si kihisi"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Tumia kihisi cha kitambulisho kwenye kifaa chako."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ongeza kingine"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Inayofuata"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Mbali na kufungua simu yako, unaweza pia kutumia kitambulisho chako kuidhinisha ununuzi na ufikiaji programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
@@ -2805,10 +2813,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Onyesha Kipokea Ishara cha SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ruhusa za ziada"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> zaidi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Kuchaji pekee"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Kuhamisha faili (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuhamisha picha (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Inachaji"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chaji tu kifaa hiki"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Umeme"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Chaji kifaa kingine kilichounganishwa"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Uhamishaji wa faili"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Hamishia faili katika Windows au Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Uhamishaji wa picha (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Hamisha picha au faili ikiwa MPT haiwezi kutumika (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Tumia kifaa kwa vifaa vya kuingiza sauti vya MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Tumia USB kwa ajili ya"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Programu zilizozimwa"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Imezimwa. Gusa ili ubadilishe."</string>
@@ -2874,4 +2888,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kunja mkon mara mbili ili ufungue kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Fungua programu ya kamera kwa kukunja kifundo cha mkono wako mara mbili"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 8e679e9..9c82d90 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -23,6 +23,6 @@
     <dimen name="fingerprint_in_app_indicator_size">176dp</dimen>
     <dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen>
 
-    <dimen name="setup_fingerprint_ring_radius">106dp</dimen>
-    <dimen name="setup_fingerprint_progress_bar_size">220dp</dimen>
+    <dimen name="setup_fingerprint_ring_radius">92dp</dimen>
+    <dimen name="setup_fingerprint_progress_bar_size">192dp</dimen>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index d873868..c331635 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"சாதனத்தைச் செயல்படச் செய்து, அதைத் திறக்க, கைரேகை உணர்வியைத் தொட்டால் போதும்."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், உங்கள் கைரேகையைப் பயன்படுத்தலாம்."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"முடிந்தது"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"அச்சச்சோ, அது உணர்வி இல்லை"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"சாதனத்தின் கைரேகை உணர்வியைப் பயன்படுத்தவும்."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"மற்றொன்றைச் சேர்"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"அடுத்து"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"மொபைலைத் திறக்க மட்டுமில்லாமல், பர்ச்சேஸ்களை உறுதிப்படுத்தவும் பயன்பாட்டை அணுகவும் கைரேகையைப் பயன்படுத்தலாம். "<annotation id="url">"மேலும் அறிக"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ட்யூனரைக் காட்டு"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"கூடுதல் அனுமதிகள்"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"மேலும் <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"சார்ஜிங்கின் போது மட்டும்"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"கோப்புகள் பரிமாற்றம் (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்கள் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"சார்ஜ் செய்தல்"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"இந்தச் சாதனத்தைச் சார்ஜ் செய்யும்"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"பவர் சப்ளை"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"இணைக்கப்பட்ட பிற சாதனத்தைச் சார்ஜ் செய்யும்"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"கோப்புப் பரிமாற்றங்கள்"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows அல்லது Mac (MTP)க்கு கோப்புகளைப் பரிமாற்றும்"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"படப் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ஆதரிக்கப்படவில்லை எனில், படங்கள் அல்லது கோப்புகளைப் பரிமாற்றும் (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI உள்ளீட்டிற்குச் சாதனத்தைப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3372728031108932425">"இதற்காக USBஐப் பயன்படுத்து:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"செயலில் இல்லாத பயன்பாடுகள்"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"செயலில் இல்லை. மாற்ற, தொடவும்."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"இது முறைமை அமைப்புகளை மாற்ற, பயன்பாட்டை அனுமதிக்கும்."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"அனுமதிக்கப்பட்டது"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"அனுமதிக்கப்படவில்லை"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"கேமராவைத் திறக்க, இருமுறை திருப்புதல்"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"உங்கள் மணிக்கட்டை இருமுறை திருப்புவதன் மூலம் கேமரா பயன்பாட்டைத் திறக்கலாம்"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index c625287..40fe5ee 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, మీరు మీ వేలిముద్రను ఉపయోగించవచ్చు."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"పూర్తయింది"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"అయ్యో, అది సెన్సార్ కాదు"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"మీ పరికరం వేలిముద్ర సెన్సార్‌ను ఉపయోగించండి."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"మరొకటి జోడించు"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"మీ ఫోన్‌ను అన్‌లాక్ చేయడంతో పాటుగా, కొనుగోళ్లు మరియు అనువర్తనం ప్రాప్యతను అనుమతించడానికి కూడా మీ వేలిముద్రను ఉపయోగించవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ట్యూనర్‌ను చూపు"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"అదనపు అనుమతులు"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"మరో <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ఛార్జింగ్ మాత్రమే"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ఫైల్‌లను బదిలీ చేయడం (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ఫోటోలను బదిలీ చేయడం (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ఛార్జింగ్"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"కేవలం ఈ పరికరాన్ని ఛార్జ్ చేస్తుంది"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"విద్యుత్ శక్తి సరఫరా"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"కనెక్ట్ చేసిన మరొక పరికరాన్ని ఛార్జ్ చేస్తుంది"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ఫైల్ బదిలీలు"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows లేదా Macకి ఫైల్‌లను బదిలీ చేస్తుంది (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ఫోటో బదిలీ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTPకి మద్దతు లేకపోతే ఫోటోలు లేదా ఫైల్‌లను బదిలీ చేస్తుంది (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ఇన్‌పుట్ కోసం పరికరాన్ని ఉపయోగిస్తుంది"</string>
     <string name="usb_use" msgid="3372728031108932425">"దీని కోసం USBని ఉపయోగించండి"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"నిష్క్రియ అనువర్తనాలు"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"నిష్క్రియంగా ఉంది. టోగుల్ చేయడానికి తాకండి."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"అవును"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"లేదు"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"కెమెరా కోసం రెండు సార్లు తిప్పడం"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"మీ ఫోన్ పట్టుకున్న ముంజేతిని రెండు సార్లు తిప్పితే కెమెరా అనువర్తనం తెరవబడుతుంది"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f00cd1e..4c7b6e1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"เมื่อเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือได้"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าคุณลักษณะนี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"เสร็จสิ้น"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"อ๊ะ นั่นไม่ใช่เซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ใช้เซ็นเซอร์ลายนิ้วมือบนอุปกรณ์"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"เพิ่มอีกหนึ่ง"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้"<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"แสดงตัวรับสัญญาณ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"สิทธิ์เพิ่มเติม"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"และอีก <xliff:g id="COUNT">%1$d</xliff:g> สิทธิ์"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"การชาร์จเท่านั้น"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"โอนไฟล์ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"โอนรูปภาพ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"การชาร์จ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"เพียงแค่ชาร์จอุปกรณ์นี้"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"แหล่งจ่ายไฟ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ชาร์จอุปกรณ์อื่นที่เชื่อมต่ออยู่"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"การโอนไฟล์"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"โอนไฟล์ไปยัง Windows หรือ Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"การโอนรูปภาพ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"โอนรูปภาพหรือไฟล์ หากระบบไม่สนับสนุน MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ใช้อุปกรณ์สำหรับการป้อนข้อมูล MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"ใช้ USB สำหรับ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"แอปที่ไม่ได้ใช้งาน"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ไม่ได้ใช้งานอยู่ แตะเพื่อสลับ"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"สิทธิ์นี้อนุญาตให้แอปแก้ไขการตั้งค่าระบบได้"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ใช่"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ไม่"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"บิด 2 ครั้งเพื่อเปิดกล้อง"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"เปิดแอปกล้องถ่ายรูปโดยบิดข้อมือ 2 ครั้ง"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7de93a6..3dcdf3a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Hawakan lang ang sensor ng fingerprint upang i-wake at i-unlock ang iyong device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kapag nakita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Laktawan ang pag-set up ng fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pinili mong gamitin ang iyong fingerprint bilang isang paraan upang i-unlock ang iyong telepono. Kung lalaktaw ka ngayon, kakailanganin mo itong i-set up sa ibang pagkakataon. Tumatagal lang nang isang minuto o higit pa ang pag-setup."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"I-set up ang lock ng screen"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tapos na"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Naku, hindi iyan ang sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gamitin ang fingerprint sensor sa device mo."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Magdagdag ng isa pa"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Susunod"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Bukod pa sa pag-a-unlock ng iyong telepono, maaari mo ring gamitin ang iyong fingerprint upang pahintulutan ang mga pagbili at pag-access sa app. "<annotation id="url">"Matuto nang higit pa"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Ipakita ang SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Mga karagdagang pahintulot"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> pa"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pagcha-charge lang"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Maglipat ng mga file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Maglipat ng mga larawan (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nagcha-charge"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"I-charge lang ang device na ito"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"I-charge ang isa pang nakakonektang device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Mga paglilipat ng file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Maglipat ng mga file sa Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Paglilipat ng larawan (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Maglipat ng mga larawan o file kung hindi sinusuportahan ang MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gamitin ang device para sa MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gamitin ang USB para sa"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Mga hindi aktibong app"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Hindi aktibo. Pindutin upang ma-toggle."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dobleng pag-twist para sa camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Buksan ang camera app sa pamamagitan ng pag-twist sa iyong kamay nang dalawang beses"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9069cad..0023d21 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cihazınızı uyandırmak ve kilidini açmak için parmak izi sensörüne dokunmanız yeterli."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu simgeyi gördüğünüzde parmak izinizi kullanabilirsiniz."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Parmak izi ayarlama atlansın mı?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefonunuzun kilidini açmak için tek yöntem olarak parmak izinizi kullanmayı seçtiniz. Şimdi atlarsanız bunu daha sonra ayarlamanız gerekecek. Ayarlama işlemi yalnızca bir veya birkaç dakika sürer."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidini ayarla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Bitti"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Yanlış oldu, bu sensör değil"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda parmak izi sensörünü kullanın."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Başka ekle"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Sonraki"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonunuzun kilidini açmanın yanında satın alma işlemlerini ve uygulama erişimini yetkilendirmek için de parmak izinizi kullanabilirsiniz. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Ayarlayıcısını Göster"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ek izinler"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> tane daha"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Yalnızca şarj"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dosya aktarma (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoğraf aktarma (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Şarj etme"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Yalnızca bu cihazı şarj et"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Güç kaynağı"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Diğer bağlı cihazı şarj et"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Dosya aktarımları"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dosyaları Windows\'a veya Mac\'e aktar (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoğraf aktarımı (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP desteklenmiyorsa fotoğrafları veya dosyaları aktar (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Cihazı MIDI girişi için kullan"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB\'yi şunun için kullan:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Devre dışı uygulamalar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Devre dışı. Değiştirmek için dokunun."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera için iki kez bükün"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Bileğinizi iki kez bükerek kamera uygulamasını açın"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7f3aed4..1c21cbb 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -350,10 +350,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Щоб активувати та розблокувати пристрій, просто торкніться датчика відбитків пальців."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Коли з’явиться цей значок, ви можете прикласти палець."</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Це не датчик"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Скористайтеся датчиком відбитків на пристрої."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додати ще"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"За допомогою цифрового відбитка можна не лише розблоковувати телефон, а й підтверджувати покупки та входити в додатки. "<annotation id="url">"Докладніше"</annotation></string>
@@ -2833,10 +2841,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показати SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Додаткові дозволи"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Ще <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Лише заряджання"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Перенесення файлів (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перенесення фотографій (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Заряджання"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Лише зарядити пристрій"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Джерело живлення"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зарядити інший підключений пристрій"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Перенесення файлів"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Перенести файли на Windows або Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Перенесення фотографій (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Перенести фотографії або файли, якщо МТР не підтримується (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Використовувати пристрій для входу MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Використання USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивні додатки"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивний додаток. Торкніться, щоб активувати."</string>
@@ -2904,4 +2918,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Додаток зможе змінювати налаштування системи."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ні"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Відкривати Камеру, покрутивши зап’ястям"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Додаток Камера відкриється, якщо двічі покрутити зап’ястям"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 514212d..133fcd0 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"اپنے آلے کو جگانے اور غیر مقفل کرنے کیلئے بس فنگرپرنٹ سنسر کو ٹچ کریں۔"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"جب آپ اس آئیکن کو دیکھیں تو آپ اپنا فنگرپرنٹ استعمال کر سکتے ہیں۔"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ہوگیا"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"افوہ، یہ سینسر نہیں ہے"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"اپنے آلہ پر فنگر پرنٹ سینسر کا استعمال کریں"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"کوئی دوسرا شامل کریں"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"آگے جائیں"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"اپنے فون کو غیر مقفل کرنے کے علاوہ، آپ خریداریوں کی توثیق کرنے اور ایپ تک رسائی حاصل کرنے کیلئے اپنے فنگر پرنٹ کا بھی استعمال کر سکتے ہیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"‏SystemUI ٹیونر دکھائیں"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"اضافی اجازتیں"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> مزید"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"صرف چارجنگ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏فائلز منتقل کریں (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏تصاویر منتقل کریں (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"چارجنگ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"صرف یہ آلہ چارج کریں"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"پاور سپلائی"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"دوسرا منسلک آلہ چارج کریں"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"فائل منتقلیاں"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏فائلیں Windows یا Mac (MTP)‎ میں منتقل کریں"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏تصویر منتقلی (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏اگر MTP تعاون یافتہ نہیں ہے تو تصاویر اور فائلیں منتقل کریں (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏MIDI ان پٹ کے لئے آلہ استعمال کریں"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏اس کیلئے USB استعمال کریں"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"غیر فعال ایپس"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غیر فعال۔ ٹوگل کرنے کیلئے ٹچ کریں۔"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"یہ اجازت ایپ کو سسٹم ترتیبات میں ترمیم کرنے دیتی ہے۔"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ہاں"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"نہیں"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"کیمرا کیلئے دو بار مروڑیں"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"اپنی کلائی کو دو بار مروڑ کر کیمرا ایپ کھولیں"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 59bba4b..7c4dacf 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ushbu belgi ko‘rinsa, siz identifikatsiya yoki xaridlarnini amalga oshirish uchun barmoq izidan foydalanishingiz mumkin."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Qurilmani uyg‘otish va uni qulfdan chiqarish uchun shunchaki barmoq izi skaneriga tegining."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Agar shu belgi ko‘rinsa, barmoq izidan foydalanish mumkin."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmoq izini sozlash o‘tkazib yuborilsinmi?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Siz telefoningizni qulfdan chiqarishning bir usuli sifatida barmoq izini tanlagansiz. Agar buni hozir o‘tkazib yuborsangiz, uni keyinroq sozlashga to‘g‘ri keladi. Sozlash atigi bir daqiqa atrofida vaqt oladi."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekranni qulfini sozlash"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tayyor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Obbo, bu sensor emas."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Qurilmadagi barmoq izi skanerini toping."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Boshqa barmoq izini qo‘shish"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Keyingi"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Shuningdek, telefoningizni qulfdan chiqarish, xaridlarni tasdiqlash va ilovalarga kirish uchun ham barmoq izidan foydalanishingiz mumkin. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner ko‘rsatilsin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Qo‘shimcha ruxsatlar"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Yana <xliff:g id="COUNT">%1$d</xliff:g> ta"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Faqat qurilmani quvvatlash"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fayl o‘tkazish (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Rasm o‘tkazish (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Quvvatlash"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Shunchaki ushbu qurilmani quvvatlash"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Quvvat manbai"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Boshqa ulangan qurilmani quvvatlash"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fayl o‘tkazish"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Fayllarni Windows yoki Mac kompyuterga o‘tkazish (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Rasm o‘tkazish (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP protokoli qo‘llab-quvvatlanmasa, rasm yoki fayllarni o‘tkazish (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Qurilmada MIDI-kirishdan foydalanish"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBdan foydalanish"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Nofaol ilovalar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Nofaol. O‘zgartirish uchun bu yerga bosing."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera uchun bilakni ikki marta bukish"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera ilovasini ochish uchun bilagingizni ikki marta buking"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c9e2c5c..a20e700 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Chỉ cần chạm vào cảm biến dấu vân tay để đánh thức và mở khóa thiết bị của bạn."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Khi nhìn thấy biểu tượng này, bạn có thể sử dụng dấu vân tay của mình."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Bỏ qua thiết lập vân tay?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Bạn đã chọn sử dụng vân tay là cách mở khóa điện thoại của mình. Nếu bỏ qua ngay bây giờ, bạn sẽ cần thiết lập cài đặt này sau. Thiết lập sẽ chỉ mất ít phút."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Thiết lập khóa màn hình"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Xong"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Rất tiếc, đó không phải là cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sử dụng cảm biến vân tay trên thiết bị của bạn."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm khác"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngoài việc mở khóa điện thoại, bạn còn có thể sử dụng vân tay của mình để ủy quyền mua và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Hiện Bộ điều chỉnh SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Quyền khác"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> khác"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Chỉ sạc"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Truyền tệp (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Truyền ảnh (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Đang sạc"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chỉ sạc thiết bị này"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Cấp nguồn"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Sạc thiết bị được kết nối khác"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Chuyển tệp"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Chuyển tệp tới Windows hoặc Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Chuyển ảnh (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Chuyển ảnh hoặc tệp nếu MTP không được hỗ trợ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Sử dụng thiết bị cho đầu vào MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sử dụng USB cho"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Ứng dụng không hoạt động"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Không hoạt động. Chạm để chuyển đổi."</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Xoắn đúp cho camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Mở ứng dụng camera bằng cách vặn cổ tay hai lần"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 09a9b9b..cfa7a02 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标，就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需触摸指纹传感器即可唤醒并解锁设备。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"当您看到此图标时，就可以使用指纹。"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，这不是传感器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您设备上的指纹传感器。"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"再添加一个"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了将手机解锁，您还可以在购买物品时和登录应用时使用自己的指纹来验证身份。"<annotation id="url">"了解详情"</annotation></string>
@@ -2799,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"显示 SystemUI 调整程序"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他权限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"另外 <xliff:g id="COUNT">%1$d</xliff:g> 项"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"仅限充电"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"传输文件 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"传输照片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充电"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"仅为此设备充电"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"电源供给"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"为其他已连接的设备充电"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"文件传输"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"将文件传输到 Windows 或 Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"照片传输 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如果 MTP 不受支持，则传输照片或文件 (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"将设备用作 MIDI 输入设备"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 的用途"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"未启用的应用"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"未启用。触摸即可切换。"</string>
@@ -2868,4 +2882,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"此权限允许应用修改系统设置。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允许"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允许"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"扭转两次即可打开相机"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"扭转手腕两次即可打开相机应用"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3f8be62..b1a944f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"如果看到這個圖示，您可以使用您的指紋加以識別或授權購買。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需輕觸指紋感應器即可喚醒裝置或為裝置解鎖。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，即可使用指紋。"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您裝置上的指紋感應器。"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"新增其他"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了解鎖您的手機，您也可以使用您的指紋授權購買和存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
@@ -2804,10 +2812,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示系統使用者介面調諧器"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 個"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"只供充電"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"傳送檔案 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"傳送相片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"正在充電"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"只為此裝置充電"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他已連接的裝置充電"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"檔案傳輸"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"透過媒體傳輸協定傳送檔案至 Windows 或 Mac"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"相片傳輸 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如不支援媒體傳輸協定，則使用相片傳輸協定傳送相片或檔案"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"使用裝置作為 MIDI 輸入"</string>
     <string name="usb_use" msgid="3372728031108932425">"使用 USB 於"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"已暫停的應用程式"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"已暫停。輕觸即可切換。"</string>
@@ -2873,4 +2887,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"此權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允許"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允許"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"轉動兩下即可使用相機功能"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"轉動手腕兩下即可開啟相機應用程式"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index be84feb..1bd849e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，就表示您可以使用指紋。"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用裝置上的指紋感應器。"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"新增另一個"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了將手機解鎖，您也可以使用指紋授權購物交易及存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
@@ -2803,10 +2811,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示 SystemUI 調整精靈"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"僅限充電"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"傳輸檔案 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"傳輸相片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電中"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"僅為這個裝置充電"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他連接的裝置充電"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"檔案轉移"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"將檔案轉移到 Windows 或 Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"相片轉移 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如果 MTP 不受支援，則轉移相片或檔案 (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"使用裝置做為 MIDI 輸入端"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 用途"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"未啟用的應用程式"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"未啟用。輕觸即可切換。"</string>
@@ -2872,4 +2886,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"這項權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"否"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"扭兩下即可開啟相機"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"扭動手腕兩次即可開啟「相機」應用程式"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9b71c44..ff915ea 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -346,10 +346,18 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Vele uthinte inzwa yezigxivizo zeminwe uphinde uvule idivayisi yakho."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Uma ubona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Yeqa ukusethwa kwezigxivizo zeminwe?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ukhethe ukusebenzisa izigxivizo zakho zeminwe njengendlela eyodwa yokuvula ifoni yakho. Uma weqa manje, kuzomele usethe lokhu ngemuva kwesikhathi. Ukusetha kuthatha iminithi noma isikhathi esingalapho."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Hlela ukuvala isikrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kwenziwe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hhayi bo, akuyona inzwa leyo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sebenzisa inzwa yezigxivizo zeminwe kudivayisi yakho."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_error_dialog_title (3618021988442639280) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_timeout_dialog_message (2942551158278899627) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_error_generic_dialog_message (3624760637222239293) -->
+    <skip />
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engeza enye"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Okulandelayo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngokungeziwe ekuvuleni ifoni yakho, ungaphinda usebenzise izigxivizo zeminwe zakho ukuze ugunyaze ukuthenga kanye nokufinyelela kokuhlelo lokusebenza. "<annotation id="url">"Funda kabanzi"</annotation></string>
@@ -2806,10 +2814,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Bonisa ishuna ye-SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Izimvume ezingeziwe"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> okuningi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Ukushaja kuphela"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dlulisa amafayela (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Dlulisa izithombe (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Iyashaja"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vele ushaje le divayisi"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Ukunikezwa kwamandla"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Shaja enye idivayisi exhunyiwe"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Ukudluliselwa kwefayela"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dlulisela amafayela ku-Windows noma i-Mac (i-MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Ukudluliswa kwesithombe (i-PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Dlulisela izithombe noma amafayela uma i-MTP ingasekelwe (i-PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"I-MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Sebenzisela idivayisi ukufakwa kwe-MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sebenzisela i-USB i-"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Izinhlelo zokusebenza ezingasebenzi"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Akusebenzi. Shintsha ukuze ushintshe."</string>
@@ -2875,4 +2889,10 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Shinthsa kabili ingalo ukuze uthole ikhamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Vula uhlelo lokusebenza lekhamera ngokushintsha ingalo yakho kabili"</string>
+    <!-- no translation found for camera_double_tap_power_gesture_title (1651873760405034645) -->
+    <skip />
+    <!-- no translation found for camera_double_tap_power_gesture_desc (7355664631775680376) -->
+    <skip />
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 0fdc396..674be1e 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -35,4 +35,7 @@
 
     <!-- Whether to show a preference item for mobile plan -->
     <bool name="config_show_mobile_plan">true</bool>
+
+    <!-- Whether none security option is hide or not  (country specific). -->
+    <bool name="config_hide_none_security_option">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d5b04c7..88dce90 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -759,6 +759,11 @@
     <string name="setup_fingerprint_enroll_finish_message">Just touch the fingerprint sensor to wake and unlock your device.</string>
     <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
     <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can use your fingerprint.</string>
+    <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
+    <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_message">You\u2019ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you\u2019ll need to set this up later. Setup takes only a minute or so.</string>
+
     <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
     <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string>
     <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
@@ -767,6 +772,12 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Whoops, that\u2019s not the sensor</string>
     <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
     <string name="security_settings_fingerprint_enroll_touch_dialog_message">Use the fingerprint sensor on your device.</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+    <string name="security_settings_fingerprint_enroll_error_dialog_title">Enrollment was not completed</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Fingerprint enrollment time limit reached. Try again.</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Fingerprint enrollment didn\'t work. Try again or use a different finger.</string>
     <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
     <string name="fingerprint_enroll_button_add">Add another</string>
     <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
@@ -6770,22 +6781,46 @@
     <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
     <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string>
 
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for charging only. -->
-    <string name="usb_use_charging_only">Charging only</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_charging_only">Charging</string>
+    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+    <string name="usb_use_charging_only_desc">Just charge this device</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+    <string name="usb_use_power_only">Power supply</string>
+    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+    <string name="usb_use_power_only_desc">Charge the other connected device</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring files via MTP. -->
-    <string name="usb_use_file_transfers">Transfer files (MTP)</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_file_transfers">File transfers</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+    <string name="usb_use_file_transfers_desc">Transfer files to Windows or Mac (MTP)</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
-    <string name="usb_use_photo_transfers">Transfer photos (PTP)</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_photo_transfers">Photo transfer (PTP)</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+    <string name="usb_use_photo_transfers_desc">Transfer photos or files if MTP is not supported (PTP)</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
     <string name="usb_use_MIDI">MIDI</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+    <string name="usb_use_MIDI_desc">Use device for MIDI input</string>
     <!-- The title used in a dialog which lets the user select what the USB connection
          for this device should be used for. Choices are usb_use_charging_only,
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
@@ -6959,4 +6994,16 @@
     <string name="write_settings_on">Yes</string>
     <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
     <string name="write_settings_off">No</string>
+
+    <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+    <string name="camera_gesture_title">Double twist for camera</string>
+
+    <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+    <string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
+
+    <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+    <string name="camera_double_tap_power_gesture_title">Press power button twice for camera</string>
+
+    <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+    <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
 </resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e04d818..7150150 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -57,6 +57,18 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <SwitchPreference
+                android:key="camera_gesture"
+                android:title="@string/camera_gesture_title"
+                android:summary="@string/camera_gesture_desc"
+                android:persistent="false" />
+
+        <SwitchPreference
+                android:key="camera_double_tap_power_gesture"
+                android:title="@string/camera_double_tap_power_gesture_title"
+                android:summary="@string/camera_double_tap_power_gesture_desc"
+                android:persistent="false" />
+
         <PreferenceScreen
                 android:key="screensaver"
                 android:title="@string/screensaver_settings_title"
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 226f8ab..3b3ce2f 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -33,12 +33,14 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
+import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
+import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
@@ -111,6 +113,8 @@
 
     private boolean mUnavailable;
 
+    private boolean mHideImsApn;
+
     private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -162,6 +166,11 @@
 
         mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
         mUiccController = UiccController.getInstance();
+
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        PersistableBundle b = configManager.getConfig();
+        mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
     }
 
     @Override
@@ -226,9 +235,12 @@
         final String mccmnc = mSubscriptionInfo == null ? ""
             : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
         Log.d(TAG, "mccmnc = " + mccmnc);
-        final String where = "numeric=\""
+        String where = "numeric=\""
             + mccmnc
             + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
+        if (mHideImsApn) {
+            where = where + " AND NOT (type='ims')";
+        }
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where, null,
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 1015a45..8c0b0b6 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -109,11 +109,18 @@
             @Override
             public void onRemovalSucceeded(Fingerprint fingerprint) {
                 Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
+                if (mFingerprintManager.getEnrolledFingerprints().size() == 0) {
+                    finish();
+                }
             }
 
             @Override
             public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
-                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                }
+                finish();
             }
         };
 
@@ -354,6 +361,10 @@
                     boolean visible = true;
                     if (KEY_UNLOCK_SET_OFF.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+                        if (getResources().getBoolean(R.bool.config_hide_none_security_option)) {
+                            enabled = false;
+                            visible = false;
+                        }
                     } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
                     } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
@@ -490,18 +501,19 @@
                 mChooseLockSettingsHelper.utils().clearLock(UserHandle.myUserId());
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled,
                         UserHandle.myUserId());
-                removeAllFingerprintTemplates();
+                removeAllFingerprintTemplatesAndFinish();
                 getActivity().setResult(Activity.RESULT_OK);
-                finish();
             } else {
-                removeAllFingerprintTemplates();
-                finish();
+                removeAllFingerprintTemplatesAndFinish();
             }
         }
 
-        private void removeAllFingerprintTemplates() {
-            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
+        private void removeAllFingerprintTemplatesAndFinish() {
+            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
+                    && mFingerprintManager.getEnrolledFingerprints().size() > 0) {
                 mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
+            } else {
+                finish();
             }
         }
 
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 64aaaca..54c3620 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -17,11 +17,11 @@
 package com.android.settings;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.settings.notification.RedactionInterstitial;
 
 import android.app.Activity;
@@ -30,7 +30,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.inputmethodservice.KeyboardView;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -122,12 +121,15 @@
     }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
-            implements OnClickListener, OnEditorActionListener,  TextWatcher {
+            implements OnClickListener, OnEditorActionListener,  TextWatcher,
+            SaveAndFinishWorker.Listener {
         private static final String KEY_FIRST_PIN = "first_pin";
         private static final String KEY_UI_STAGE = "ui_stage";
         private static final String KEY_CURRENT_PASSWORD = "current_password";
+        private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
 
         private String mCurrentPassword;
+        private String mChosenPassword;
         private boolean mHasChallenge;
         private long mChallenge;
         private TextView mPasswordEntry;
@@ -141,11 +143,11 @@
         private int mPasswordMinNumeric = 0;
         private int mPasswordMinNonLetter = 0;
         private LockPatternUtils mLockPatternUtils;
-        private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private Stage mUiStage = Stage.Introduction;
-        private boolean mDone = false;
+
         private TextView mHeaderText;
         private String mFirstPin;
         private KeyboardView mKeyboardView;
@@ -301,8 +303,11 @@
                 if (mCurrentPassword == null) {
                     mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD);
                 }
+
+                // Re-attach to the exiting worker if there is one.
+                mSaveAndFinishWorker = (SaveAndFinishWorker) getFragmentManager().findFragmentByTag(
+                        FRAGMENT_TAG_SAVE_AND_FINISH);
             }
-            mDone = false;
             if (activity instanceof SettingsActivity) {
                 final SettingsActivity sa = (SettingsActivity) activity;
                 int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
@@ -321,16 +326,18 @@
         public void onResume() {
             super.onResume();
             updateStage(mUiStage);
-            mPasswordEntryInputDisabler.setInputEnabled(true);
-            mKeyboardView.requestFocus();
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(this);
+            } else {
+                mKeyboardView.requestFocus();
+            }
         }
 
         @Override
         public void onPause() {
             mHandler.removeMessages(MSG_SHOW_ERROR);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(null);
             }
 
             super.onPause();
@@ -479,36 +486,22 @@
         }
 
         public void handleNext() {
-            if (mDone) return;
-
-            final String pin = mPasswordEntry.getText().toString();
-            if (TextUtils.isEmpty(pin)) {
+            if (mSaveAndFinishWorker != null) return;
+            mChosenPassword = mPasswordEntry.getText().toString();
+            if (TextUtils.isEmpty(mChosenPassword)) {
                 return;
             }
             String errorMsg = null;
             if (mUiStage == Stage.Introduction) {
-                errorMsg = validatePassword(pin);
+                errorMsg = validatePassword(mChosenPassword);
                 if (errorMsg == null) {
-                    mFirstPin = pin;
+                    mFirstPin = mChosenPassword;
                     mPasswordEntry.setText("");
                     updateStage(Stage.NeedToConfirm);
                 }
             } else if (mUiStage == Stage.NeedToConfirm) {
-                if (mFirstPin.equals(pin)) {
-                    boolean wasSecureBefore = mLockPatternUtils.isSecure(UserHandle.myUserId());
-                    final boolean required = getActivity().getIntent().getBooleanExtra(
-                            EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
-                    mLockPatternUtils.setCredentialRequiredToDecrypt(required);
-                    mLockPatternUtils.saveLockPassword(pin, mCurrentPassword, mRequestedQuality,
-                            UserHandle.myUserId());
-
-                    if (mHasChallenge) {
-                        startVerifyPassword(pin, wasSecureBefore);
-                        return;
-                    } else {
-                        getActivity().setResult(RESULT_FINISHED);
-                    }
-                    finishConfirmStage(wasSecureBefore);
+                if (mFirstPin.equals(mChosenPassword)) {
+                    startSaveAndFinish();
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
                     if (tmp != null) {
@@ -522,50 +515,6 @@
             }
         }
 
-        private void startVerifyPassword(final String pin, final boolean wasSecureBefore) {
-            mPasswordEntryInputDisabler.setInputEnabled(false);
-            setNextEnabled(false);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-            }
-
-            mPendingLockCheck = LockPatternChecker.verifyPassword(
-                    mLockPatternUtils,
-                    pin,
-                    mChallenge,
-                    UserHandle.myUserId(),
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            if (token == null) {
-                                Log.e(TAG, "critical: no token returned from known good password");
-                            }
-
-                            mPasswordEntryInputDisabler.setInputEnabled(true);
-                            setNextEnabled(true);
-                            mPendingLockCheck = null;
-
-                            Intent intent = new Intent();
-                            intent.putExtra(
-                                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                    token);
-                            getActivity().setResult(RESULT_FINISHED, intent);
-                            finishConfirmStage(wasSecureBefore);
-                        }
-                    });
-        }
-
-        private void finishConfirmStage(boolean wasSecureBefore) {
-            getActivity().finish();
-            mDone = true;
-            if (!wasSecureBefore) {
-                Intent intent = getRedactionInterstitialIntent(getActivity());
-                if (intent != null) {
-                    startActivity(intent);
-                }
-            }
-        }
-
         protected void setNextEnabled(boolean enabled) {
             mNextButton.setEnabled(enabled);
         }
@@ -609,6 +558,7 @@
          * Update the hint based on current Stage and length of password entry
          */
         private void updateUi() {
+            final boolean canInput = mSaveAndFinishWorker == null;
             String password = mPasswordEntry.getText().toString();
             final int length = password.length();
             if (mUiStage == Stage.Introduction) {
@@ -629,9 +579,10 @@
                 }
             } else {
                 mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
-                setNextEnabled(length > 0);
+                setNextEnabled(canInput && length > 0);
             }
             setNextText(mUiStage.buttonText);
+            mPasswordEntryInputDisabler.setInputEnabled(canInput);
         }
 
         public void afterTextChanged(Editable s) {
@@ -649,5 +600,83 @@
         public void onTextChanged(CharSequence s, int start, int before, int count) {
 
         }
+
+        private void startSaveAndFinish() {
+            if (mSaveAndFinishWorker != null) {
+                Log.w(TAG, "startSaveAndFinish with an existing SaveAndFinishWorker.");
+                return;
+            }
+
+            mPasswordEntryInputDisabler.setInputEnabled(false);
+            setNextEnabled(false);
+
+            mSaveAndFinishWorker = new SaveAndFinishWorker();
+            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
+                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
+            mSaveAndFinishWorker.setListener(this);
+
+            final boolean required = getActivity().getIntent().getBooleanExtra(
+                    EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+            mSaveAndFinishWorker.start(mLockPatternUtils, required, mHasChallenge, mChallenge,
+                    mChosenPassword, mCurrentPassword, mRequestedQuality);
+        }
+
+        @Override
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
+            getActivity().setResult(RESULT_FINISHED, resultData);
+            getActivity().finish();
+
+            if (!wasSecureBefore) {
+                Intent intent = getRedactionInterstitialIntent(getActivity());
+                if (intent != null) {
+                    startActivity(intent);
+                }
+            }
+        }
+    }
+
+    private static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {
+
+        private String mChosenPassword;
+        private String mCurrentPassword;
+        private int mRequestedQuality;
+
+        public void start(LockPatternUtils utils, boolean required,
+                boolean hasChallenge, long challenge,
+                String chosenPassword, String currentPassword, int requestedQuality) {
+            prepare(utils, required, hasChallenge, challenge);
+
+            mChosenPassword = chosenPassword;
+            mCurrentPassword = currentPassword;
+            mRequestedQuality = requestedQuality;
+
+            start();
+        }
+
+        @Override
+        protected Intent saveAndVerifyInBackground() {
+            Intent result = null;
+            final int userId = UserHandle.myUserId();
+            mUtils.saveLockPassword(mChosenPassword, mCurrentPassword, mRequestedQuality,
+                    userId);
+
+            if (mHasChallenge) {
+                byte[] token;
+                try {
+                    token = mUtils.verifyPassword(mChosenPassword, mChallenge, userId);
+                } catch (RequestThrottledException e) {
+                    token = null;
+                }
+
+                if (token == null) {
+                    Log.e(TAG, "critical: no token returned for known good password.");
+                }
+
+                result = new Intent();
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 087a23e..1dd24f2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -19,8 +19,8 @@
 import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
-import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.settings.notification.RedactionInterstitial;
@@ -31,7 +31,6 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.Log;
@@ -125,7 +124,7 @@
     }
 
     public static class ChooseLockPatternFragment extends InstrumentedFragment
-            implements View.OnClickListener {
+            implements View.OnClickListener, SaveAndFinishWorker.Listener {
 
         public static final int CONFIRM_EXISTING_REQUEST = 55;
 
@@ -137,6 +136,8 @@
 
         private static final int ID_EMPTY_MESSAGE = -1;
 
+        private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
+
         private String mCurrentPattern;
         private boolean mHasChallenge;
         private long mChallenge;
@@ -346,7 +347,6 @@
         }
 
         private Stage mUiStage = Stage.Introduction;
-        private boolean mDone = false;
 
         private Runnable mClearPatternRunnable = new Runnable() {
             public void run() {
@@ -355,7 +355,7 @@
         };
 
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-        private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private SaveAndFinishWorker mSaveAndFinishWorker;
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -434,22 +434,29 @@
                     mCurrentPattern = savedInstanceState.getString(KEY_CURRENT_PATTERN);
                 }
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
+
+                // Re-attach to the exiting worker if there is one.
+                mSaveAndFinishWorker = (SaveAndFinishWorker) getFragmentManager().findFragmentByTag(
+                        FRAGMENT_TAG_SAVE_AND_FINISH);
             }
-            mDone = false;
         }
 
         @Override
         public void onResume() {
             super.onResume();
-            mLockPatternView.enableInput();
+            updateStage(mUiStage);
+
+            if (mSaveAndFinishWorker != null) {
+                setRightButtonEnabled(false);
+                mSaveAndFinishWorker.setListener(this);
+            }
         }
 
         @Override
         public void onPause() {
             super.onPause();
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(null);
             }
         }
 
@@ -483,7 +490,7 @@
                     throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
                             + " when button is " + RightButtonMode.Confirm);
                 }
-                saveChosenPatternAndFinish();
+                startSaveAndFinish();
             } else if (mUiStage.rightMode == RightButtonMode.Ok) {
                 if (mUiStage != Stage.HelpScreen) {
                     throw new IllegalStateException("Help screen is only mode with ok button, "
@@ -570,7 +577,7 @@
             setRightButtonText(stage.rightMode.text);
             setRightButtonEnabled(stage.rightMode.enabled);
 
-            // same for whether the patten is enabled
+            // same for whether the pattern is enabled
             if (stage.patternEnabled) {
                 mLockPatternView.enableInput();
             } else {
@@ -615,7 +622,6 @@
             }
         }
 
-
         // clear the wrong pattern unless they have started a new one
         // already
         private void postClearPatternRunnable() {
@@ -623,77 +629,90 @@
             mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
         }
 
-        private void saveChosenPatternAndFinish() {
-            if (mDone) return;
-            LockPatternUtils utils = mChooseLockSettingsHelper.utils();
-            final boolean lockVirgin = !utils.isPatternEverChosen(UserHandle.myUserId());
+        private void startSaveAndFinish() {
+            if (mSaveAndFinishWorker != null) {
+                Log.w(TAG, "startSaveAndFinish with an existing SaveAndFinishWorker.");
+                return;
+            }
 
-            boolean wasSecureBefore = utils.isSecure(UserHandle.myUserId());
+            setRightButtonEnabled(false);
+
+            mSaveAndFinishWorker = new SaveAndFinishWorker();
+            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
+                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
+            mSaveAndFinishWorker.setListener(this);
 
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+            mSaveAndFinishWorker.start(mChooseLockSettingsHelper.utils(), required,
+                    mHasChallenge, mChallenge, mChosenPattern, mCurrentPattern);
+        }
 
-            utils.setCredentialRequiredToDecrypt(required);
-            utils.saveLockPattern(mChosenPattern, mCurrentPattern, UserHandle.myUserId());
+        @Override
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
+            getActivity().setResult(RESULT_FINISHED, resultData);
+            getActivity().finish();
 
-            if (lockVirgin) {
-                utils.setVisiblePatternEnabled(true, UserHandle.myUserId());
+            if (!wasSecureBefore) {
+                Intent intent = getRedactionInterstitialIntent(getActivity());
+                if (intent != null) {
+                    startActivity(intent);
+                }
             }
+        }
+    }
+
+    private static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {
+
+        private List<LockPatternView.Cell> mChosenPattern;
+        private String mCurrentPattern;
+        private boolean mLockVirgin;
+
+        public void start(LockPatternUtils utils, boolean credentialRequired,
+                boolean hasChallenge, long challenge,
+                List<LockPatternView.Cell> chosenPattern, String currentPattern) {
+            prepare(utils, credentialRequired, hasChallenge, challenge);
+
+            mCurrentPattern = currentPattern;
+            mChosenPattern = chosenPattern;
+
+            mLockVirgin = !mUtils.isPatternEverChosen(UserHandle.myUserId());
+
+            start();
+        }
+
+        @Override
+        protected Intent saveAndVerifyInBackground() {
+            Intent result = null;
+            final int userId = UserHandle.myUserId();
+            mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);
 
             if (mHasChallenge) {
-                startVerifyPattern(utils, wasSecureBefore);
-            } else {
-                if (!wasSecureBefore) {
-                    Intent intent = getRedactionInterstitialIntent(getActivity());
-                    if (intent != null) {
-                        startActivity(intent);
-                    }
+                byte[] token;
+                try {
+                    token = mUtils.verifyPattern(mChosenPattern, mChallenge, userId);
+                } catch (RequestThrottledException e) {
+                    token = null;
                 }
-                getActivity().setResult(RESULT_FINISHED);
-                doFinish();
-            }
-        }
 
-        private void startVerifyPattern(LockPatternUtils utils, final boolean wasSecureBefore) {
-            mLockPatternView.disableInput();
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
+                if (token == null) {
+                    Log.e(TAG, "critical: no token returned for known good pattern");
+                }
+
+                result = new Intent();
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
             }
 
-            mPendingLockCheck = LockPatternChecker.verifyPattern(
-                    utils,
-                    mChosenPattern,
-                    mChallenge,
-                    UserHandle.myUserId(),
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            if (token == null) {
-                                Log.e(TAG, "critical: no token returned for known good pattern");
-                            }
-
-                            mLockPatternView.enableInput();
-                            mPendingLockCheck = null;
-
-                            if (!wasSecureBefore) {
-                                Intent intent = getRedactionInterstitialIntent(getActivity());
-                                if (intent != null) {
-                                    startActivity(intent);
-                                }
-                            }
-
-                            Intent intent = new Intent();
-                            intent.putExtra(
-                                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
-                            getActivity().setResult(RESULT_FINISHED, intent);
-                            doFinish();
-                        }
-                    });
+            return result;
         }
 
-        private void doFinish() {
-            getActivity().finish();
-            mDone = true;
+        @Override
+        protected void finish(Intent resultData) {
+            if (mLockVirgin) {
+                mUtils.setVisiblePatternEnabled(true, UserHandle.myUserId());
+            }
+
+            super.finish(resultData);
         }
     }
 }
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1c42045..cce29dd 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -16,10 +16,8 @@
 
 package com.android.settings;
 
-import android.os.UserHandle;
 import android.text.TextUtils;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.util.ArrayUtils;
 import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.TextViewInputDisabler;
@@ -78,19 +76,20 @@
     }
 
     public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment
-            implements OnClickListener, OnEditorActionListener {
-        private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
-                = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
+            implements OnClickListener, OnEditorActionListener,
+            CredentialCheckResultTracker.Listener {
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
+        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
         private TextView mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
         private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private CredentialCheckResultTracker mCredentialCheckResultTracker;
+        private boolean mDisappearing = false;
         private TextView mHeaderTextView;
         private TextView mDetailsTextView;
         private TextView mErrorTextView;
         private Handler mHandler = new Handler();
-        private int mNumWrongConfirmAttempts;
         private CountDownTimer mCountdownTimer;
         private boolean mIsAlpha;
         private InputMethodManager mImm;
@@ -110,11 +109,6 @@
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
             mEffectiveUserId = Utils.getEffectiveUserId(getActivity());
-
-            if (savedInstanceState != null) {
-                mNumWrongConfirmAttempts = savedInstanceState.getInt(
-                        KEY_NUM_WRONG_CONFIRM_ATTEMPTS, 0);
-            }
         }
 
         @Override
@@ -165,6 +159,15 @@
                     0.5f /* delayScale */, AnimationUtils.loadInterpolator(
                             getContext(), android.R.interpolator.fast_out_linear_in));
             setAccessibilityTitle(mHeaderTextView.getText());
+
+            mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager()
+                    .findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT);
+            if (mCredentialCheckResultTracker == null) {
+                mCredentialCheckResultTracker = new CredentialCheckResultTracker();
+                getFragmentManager().beginTransaction().add(mCredentialCheckResultTracker,
+                        FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
+            }
+
             return view;
         }
 
@@ -227,10 +230,7 @@
                 mCountdownTimer.cancel();
                 mCountdownTimer = null;
             }
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
-            }
+            mCredentialCheckResultTracker.setListener(null);
         }
 
         @Override
@@ -243,21 +243,17 @@
             super.onResume();
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId);
             if (deadline != 0) {
+                mCredentialCheckResultTracker.clearResult();
                 handleAttemptLockout(deadline);
             } else {
                 resetState();
             }
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
+            mCredentialCheckResultTracker.setListener(this);
         }
 
         @Override
         protected void authenticationSucceeded() {
-            startDisappearAnimation(new Intent());
+            mCredentialCheckResultTracker.setResult(true, new Intent(), 0, mEffectiveUserId);
         }
 
         @Override
@@ -298,11 +294,12 @@
         }
 
         private void handleNext() {
-            mPasswordEntryInputDisabler.setInputEnabled(false);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
+            if (mPendingLockCheck != null || mDisappearing) {
+                return;
             }
 
+            mPasswordEntryInputDisabler.setInputEnabled(false);
+
             final String pin = mPasswordEntry.getText().toString();
             final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
@@ -317,7 +314,7 @@
                 return;
             }
 
-            onPasswordChecked(false, intent, 0, mEffectiveUserId);
+            mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
         }
 
         private boolean isInternalActivity() {
@@ -344,7 +341,8 @@
                                         ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                         token);
                             }
-                            onPasswordChecked(matched, intent, timeoutMs, localEffectiveUserId);
+                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                    localEffectiveUserId);
                         }
                     });
         }
@@ -366,16 +364,27 @@
                                 intent.putExtra(
                                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
                             }
-                            onPasswordChecked(matched, intent, timeoutMs, localEffectiveUserId);
+                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                    localEffectiveUserId);
                         }
                     });
         }
 
         private void startDisappearAnimation(final Intent intent) {
+            if (mDisappearing) {
+                return;
+            }
+            mDisappearing = true;
+
             if (getActivity().getThemeResId() == R.style.Theme_ConfirmDeviceCredentialsDark) {
                 mDisappearAnimationUtils.startAnimation(getActiveViews(), new Runnable() {
                     @Override
                     public void run() {
+                        // Bail if there is no active activity.
+                        if (getActivity() == null || getActivity().isFinishing()) {
+                            return;
+                        }
+
                         getActivity().setResult(RESULT_OK, intent);
                         getActivity().finish();
                         getActivity().overridePendingTransition(
@@ -405,6 +414,12 @@
             }
         }
 
+        @Override
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            onPasswordChecked(matched, intent, timeoutMs, effectiveUserId);
+        }
+
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
             mPasswordEntry.setEnabled(false);
@@ -424,7 +439,6 @@
                 public void onFinish() {
                     resetState();
                     mErrorTextView.setText("");
-                    mNumWrongConfirmAttempts = 0;
                 }
             }.start();
         }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 51cde60..94ba01a 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -32,7 +32,6 @@
 import android.os.SystemClock;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -76,17 +75,18 @@
     }
 
     public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment
-            implements AppearAnimationCreator<Object> {
+            implements AppearAnimationCreator<Object>, CredentialCheckResultTracker.Listener {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
 
-        private static final String KEY_NUM_WRONG_ATTEMPTS = "num_wrong_attempts";
+        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
 
         private LockPatternView mLockPatternView;
         private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
-        private int mNumWrongConfirmAttempts;
+        private CredentialCheckResultTracker mCredentialCheckResultTracker;
+        private boolean mDisappearing = false;
         private CountDownTimer mCountdownTimer;
 
         private TextView mHeaderTextView;
@@ -148,9 +148,7 @@
             mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
             updateStage(Stage.NeedToUnlock);
 
-            if (savedInstanceState != null) {
-                mNumWrongConfirmAttempts = savedInstanceState.getInt(KEY_NUM_WRONG_ATTEMPTS);
-            } else {
+            if (savedInstanceState == null) {
                 // on first launch, if no lock pattern is set, then finish with
                 // success (don't want user to get stuck confirming something that
                 // doesn't exist).
@@ -174,13 +172,21 @@
                         }
                     });
             setAccessibilityTitle(mHeaderTextView.getText());
+
+            mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager()
+                    .findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT);
+            if (mCredentialCheckResultTracker == null) {
+                mCredentialCheckResultTracker = new CredentialCheckResultTracker();
+                getFragmentManager().beginTransaction().add(mCredentialCheckResultTracker,
+                        FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
+            }
+
             return view;
         }
 
         @Override
         public void onSaveInstanceState(Bundle outState) {
             // deliberately not calling super since we are managing this in full
-            outState.putInt(KEY_NUM_WRONG_ATTEMPTS, mNumWrongConfirmAttempts);
         }
 
         @Override
@@ -190,10 +196,7 @@
             if (mCountdownTimer != null) {
                 mCountdownTimer.cancel();
             }
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
-            }
+            mCredentialCheckResultTracker.setListener(null);
         }
 
         @Override
@@ -208,13 +211,14 @@
             // if the user is currently locked out, enforce it.
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId);
             if (deadline != 0) {
+                mCredentialCheckResultTracker.clearResult();
                 handleAttemptLockout(deadline);
             } else if (!mLockPatternView.isEnabled()) {
                 // The deadline has passed, but the timer was cancelled. Or the pending lock
                 // check was cancelled. Need to clean up.
-                mNumWrongConfirmAttempts = 0;
                 updateStage(Stage.NeedToUnlock);
             }
+            mCredentialCheckResultTracker.setListener(this);
         }
 
         @Override
@@ -317,16 +321,26 @@
 
         @Override
         protected void authenticationSucceeded() {
-            startDisappearAnimation(new Intent());
+            mCredentialCheckResultTracker.setResult(true, new Intent(), 0, mEffectiveUserId);
         }
 
         private void startDisappearAnimation(final Intent intent) {
+            if (mDisappearing) {
+                return;
+            }
+            mDisappearing = true;
+
             if (getActivity().getThemeResId() == R.style.Theme_ConfirmDeviceCredentialsDark) {
                 mLockPatternView.clearPattern();
                 mDisappearAnimationUtils.startAnimation2d(getActiveViews(),
                         new Runnable() {
                             @Override
                             public void run() {
+                                // Bail if there is no active activity.
+                                if (getActivity() == null || getActivity().isFinishing()) {
+                                    return;
+                                }
+
                                 getActivity().setResult(RESULT_OK, intent);
                                 getActivity().finish();
                                 getActivity().overridePendingTransition(
@@ -370,11 +384,12 @@
             }
 
             public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                mLockPatternView.setEnabled(false);
-                if (mPendingLockCheck != null) {
-                    mPendingLockCheck.cancel(false);
+                if (mPendingLockCheck != null || mDisappearing) {
+                    return;
                 }
 
+                mLockPatternView.setEnabled(false);
+
                 final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
                 Intent intent = new Intent();
@@ -388,7 +403,7 @@
                     return;
                 }
 
-                onPatternChecked(pattern, false, intent, 0, mEffectiveUserId);
+                mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
             }
 
             private boolean isInternalActivity() {
@@ -416,8 +431,8 @@
                                             ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                             token);
                                 }
-                                onPatternChecked(pattern,
-                                        matched, intent, timeoutMs, localEffectiveUserId);
+                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                        localEffectiveUserId);
                             }
                         });
             }
@@ -425,7 +440,7 @@
             private void startCheckPattern(final List<LockPatternView.Cell> pattern,
                     final Intent intent) {
                 if (pattern.size() < LockPatternUtils.MIN_PATTERN_REGISTER_FAIL) {
-                    onPatternChecked(pattern, false, intent, 0, mEffectiveUserId);
+                    mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
                     return;
                 }
 
@@ -444,29 +459,35 @@
                                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
                                                     LockPatternUtils.patternToString(pattern));
                                 }
-                                onPatternChecked(pattern, matched, intent, timeoutMs,
+                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
                                         localEffectiveUserId);
                             }
                         });
             }
+        };
 
-            private void onPatternChecked(List<LockPatternView.Cell> pattern,
-                    boolean matched, Intent intent, int timeoutMs, int effectiveUserId) {
-                mLockPatternView.setEnabled(true);
-                if (matched) {
-                    startDisappearAnimation(intent);
+        private void onPatternChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            mLockPatternView.setEnabled(true);
+            if (matched) {
+                startDisappearAnimation(intent);
+            } else {
+                if (timeoutMs > 0) {
+                    long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
+                            effectiveUserId, timeoutMs);
+                    handleAttemptLockout(deadline);
                 } else {
-                    if (timeoutMs > 0) {
-                        long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
-                                effectiveUserId, timeoutMs);
-                        handleAttemptLockout(deadline);
-                    } else {
-                        updateStage(Stage.NeedToUnlockWrong);
-                        postClearPatternRunnable();
-                    }
+                    updateStage(Stage.NeedToUnlockWrong);
+                    postClearPatternRunnable();
                 }
             }
-        };
+        }
+
+        @Override
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            onPatternChecked(matched, intent, timeoutMs, effectiveUserId);
+        }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             updateStage(Stage.LockedOut);
@@ -485,7 +506,6 @@
 
                 @Override
                 public void onFinish() {
-                    mNumWrongConfirmAttempts = 0;
                     updateStage(Stage.NeedToUnlock);
                 }
             }.start();
diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/CredentialCheckResultTracker.java
new file mode 100644
index 0000000..5c55073
--- /dev/null
+++ b/src/com/android/settings/CredentialCheckResultTracker.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * An invisible retained fragment to track lock check result.
+ */
+public class CredentialCheckResultTracker extends Fragment {
+
+    private Listener mListener;
+    private boolean mHasResult = false;
+
+    private boolean mResultMatched;
+    private Intent mResultData;
+    private int mResultTimeoutMs;
+    private int mResultEffectiveUserId;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public void setListener(Listener listener) {
+        if (mListener == listener) {
+            return;
+        }
+
+        mListener = listener;
+        if (mListener != null && mHasResult) {
+            mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
+                    mResultEffectiveUserId);
+        }
+    }
+
+    public void setResult(boolean matched, Intent intent, int timeoutMs, int effectiveUserId) {
+        mResultMatched = matched;
+        mResultData = intent;
+        mResultTimeoutMs = timeoutMs;
+        mResultEffectiveUserId = effectiveUserId;
+
+        mHasResult = true;
+        if (mListener != null) {
+            mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
+                    mResultEffectiveUserId);
+        }
+    }
+
+    public void clearResult() {
+        mHasResult = false;
+        mResultMatched = false;
+        mResultData = null;
+        mResultTimeoutMs = 0;
+        mResultEffectiveUserId = 0;
+    }
+
+    interface Listener {
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId);
+    }
+}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index eef3c6b..de15d4c 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -22,6 +22,8 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
 import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
 import static android.provider.Settings.Secure.DOZE_ENABLED;
 import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
@@ -74,6 +76,9 @@
     private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private static final String KEY_NIGHT_MODE = "night_mode";
+    private static final String KEY_CAMERA_GESTURE = "camera_gesture";
+    private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
+            = "camera_double_tap_power_gesture";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
@@ -88,6 +93,8 @@
     private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
+    private SwitchPreference mCameraGesturePreference;
+    private SwitchPreference mCameraDoubleTapPowerGesturePreference;
 
     @Override
     protected int getMetricsCategory() {
@@ -149,6 +156,21 @@
             removePreference(KEY_TAP_TO_WAKE);
         }
 
+        if (isCameraGestureAvailable(getResources())) {
+            mCameraGesturePreference = (SwitchPreference) findPreference(KEY_CAMERA_GESTURE);
+            mCameraGesturePreference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(KEY_CAMERA_GESTURE);
+        }
+
+        if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
+            mCameraDoubleTapPowerGesturePreference
+                    = (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+            mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+        }
+
         if (RotationPolicy.isRotationLockToggleVisible(activity)) {
             DropDownPreference rotatePreference =
                     (DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -224,6 +246,18 @@
         return res.getBoolean(com.android.internal.R.bool.config_automatic_brightness_available);
     }
 
+    private static boolean isCameraGestureAvailable(Resources res) {
+        boolean configSet = res.getInteger(
+                com.android.internal.R.integer.config_cameraLaunchGestureSensorType) != -1;
+        return configSet &&
+                !SystemProperties.getBoolean("gesture.disable_camera_launch", false);
+    }
+
+    private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
+        return res.getBoolean(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    }
+
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
         ListPreference preference = mScreenTimeoutPreference;
         String summary;
@@ -370,6 +404,19 @@
             int value = Settings.Secure.getInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, 0);
             mTapToWakePreference.setChecked(value != 0);
         }
+
+        // Update camera gesture #1 if it is available.
+        if (mCameraGesturePreference != null) {
+            int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
+            mCameraGesturePreference.setChecked(value == 0);
+        }
+
+        // Update camera gesture #2 if it is available.
+        if (mCameraDoubleTapPowerGesturePreference != null) {
+            int value = Settings.Secure.getInt(
+                    getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+            mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
+        }
     }
 
     private void updateScreenSaverSummary() {
@@ -425,6 +472,16 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
         }
+        if (preference == mCameraGesturePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
+                    value ? 0 : 1 /* Backwards because setting is for disabling */);
+        }
+        if (preference == mCameraDoubleTapPowerGesturePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                    value ? 0 : 1 /* Backwards because setting is for disabling */);
+        }
         if (preference == mNightModePreference) {
             try {
                 final int value = Integer.parseInt((String) objValue);
@@ -493,6 +550,12 @@
                     if (!isTapToWakeAvailable(context.getResources())) {
                         result.add(KEY_TAP_TO_WAKE);
                     }
+                    if (!isCameraGestureAvailable(context.getResources())) {
+                        result.add(KEY_CAMERA_GESTURE);
+                    }
+                    if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
+                        result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+                    }
                     return result;
                 }
             };
diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/InstrumentedActivity.java
new file mode 100644
index 0000000..4a0e03a
--- /dev/null
+++ b/src/com/android/settings/InstrumentedActivity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2015 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;
+
+import com.android.internal.logging.MetricsLogger;
+
+import android.app.Activity;
+
+/**
+ * Instrumented activity that logs visibility state.
+ */
+public abstract class InstrumentedActivity extends Activity {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(this, getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(this, getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/SaveChosenLockWorkerBase.java b/src/com/android/settings/SaveChosenLockWorkerBase.java
new file mode 100644
index 0000000..a40871a
--- /dev/null
+++ b/src/com/android/settings/SaveChosenLockWorkerBase.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+import com.android.internal.widget.LockPatternUtils;
+
+/**
+ * An invisible retained worker fragment to track the AsyncWork that saves (and optionally
+ * verifies if a challenge is given) the chosen lock credential (pattern/pin/password).
+ */
+abstract class SaveChosenLockWorkerBase extends Fragment {
+
+    private Listener mListener;
+    private boolean mFinished;
+    private Intent mResultData;
+
+    protected LockPatternUtils mUtils;
+    protected boolean mHasChallenge;
+    protected long mChallenge;
+    protected boolean mWasSecureBefore;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public void setListener(Listener listener) {
+        if (mListener == listener) {
+            return;
+        }
+
+        mListener = listener;
+        if (mFinished && mListener != null) {
+            mListener.onChosenLockSaveFinished(mWasSecureBefore, mResultData);
+        }
+    }
+
+    protected void prepare(LockPatternUtils utils, boolean credentialRequired,
+            boolean hasChallenge, long challenge) {
+        mUtils = utils;
+
+        mHasChallenge = hasChallenge;
+        mChallenge = challenge;
+        mWasSecureBefore = mUtils.isSecure(UserHandle.myUserId());
+
+        mUtils.setCredentialRequiredToDecrypt(credentialRequired);
+
+        mFinished = false;
+        mResultData = null;
+    }
+
+    protected void start() {
+        new Task().execute();
+    }
+
+    /**
+     * Executes the save and verify work in background.
+     * @return Intent with challenge token or null.
+     */
+    protected abstract Intent saveAndVerifyInBackground();
+
+    protected void finish(Intent resultData) {
+        mFinished = true;
+        mResultData = resultData;
+        if (mListener != null) {
+            mListener.onChosenLockSaveFinished(mWasSecureBefore, mResultData);
+        }
+    }
+
+    private class Task extends AsyncTask<Void, Void, Intent> {
+        @Override
+        protected Intent doInBackground(Void... params){
+            return saveAndVerifyInBackground();
+        }
+
+        @Override
+        protected void onPostExecute(Intent resultData) {
+            finish(resultData);
+        }
+    }
+
+    interface Listener {
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData);
+    }
+}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index baf04d4..b957c38 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -505,7 +505,10 @@
     }
 
     public void finish() {
-        getActivity().onBackPressed();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.onBackPressed();
+        }
     }
 
     public boolean startFragment(Fragment caller, String fragmentClass, int titleRes,
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 459dc27..b6effad 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -69,7 +69,7 @@
     @Override
     public void onCreate() {
         super.onCreate();
-        if (DEBUG) Log.d(TAG, "Creating WifiProvisionService");
+        if (DEBUG) Log.d(TAG, "Creating TetherService");
         String provisionResponse = getResources().getString(
                 com.android.internal.R.string.config_mobile_hotspot_provision_response);
         registerReceiver(mReceiver, new IntentFilter(provisionResponse),
@@ -125,7 +125,7 @@
         }
         // We want to be started if we are killed accidently, so that we can be sure we finish
         // the check.
-        return START_STICKY;
+        return START_REDELIVER_INTENT;
     }
 
     @Override
@@ -137,7 +137,7 @@
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit();
 
-        if (DEBUG) Log.d(TAG, "Destroying WifiProvisionService");
+        if (DEBUG) Log.d(TAG, "Destroying TetherService");
         unregisterReceiver(mReceiver);
         super.onDestroy();
     }
@@ -262,6 +262,10 @@
             String provisionResponse = context.getResources().getString(
                     com.android.internal.R.string.config_mobile_hotspot_provision_response);
             if (provisionResponse.equals(intent.getAction())) {
+                if (!mInProvisionCheck) {
+                    Log.e(TAG, "Unexpected provision response " + intent);
+                    return;
+                }
                 mInProvisionCheck = false;
                 int checkType = mCurrentTethers.get(mCurrentTypeIndex);
                 if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) {
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
new file mode 100644
index 0000000..210e0a0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2015 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.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbManager;
+import android.hardware.usb.UsbPort;
+import android.hardware.usb.UsbPortStatus;
+import android.os.UserManager;
+
+public class UsbBackend {
+
+    private static final int MODE_POWER_MASK  = 0x01;
+    public static final int MODE_POWER_SINK   = 0x00;
+    public static final int MODE_POWER_SOURCE = 0x01;
+
+    private static final int MODE_DATA_MASK  = 0x03 << 1;
+    public static final int MODE_DATA_NONE   = 0x00 << 1;
+    public static final int MODE_DATA_MTP    = 0x01 << 1;
+    public static final int MODE_DATA_PTP    = 0x02 << 1;
+    public static final int MODE_DATA_MIDI   = 0x03 << 1;
+
+    private final boolean mRestricted;
+
+    private UserManager mUserManager;
+    private UsbManager mUsbManager;
+    private UsbPort mPort;
+    private UsbPortStatus mPortStatus;
+
+    private boolean mIsUnlocked;
+
+    public UsbBackend(Context context) {
+        Intent intent = context.registerReceiver(null,
+                new IntentFilter(UsbManager.ACTION_USB_STATE));
+        mIsUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
+
+        mUserManager = UserManager.get(context);
+        mUsbManager = context.getSystemService(UsbManager.class);
+
+        mRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        UsbPort[] ports = mUsbManager.getPorts();
+        // For now look for a connected port, in the future we should identify port in the
+        // notification and pick based on that.
+        final int N = ports.length;
+        for (int i = 0; i < N; i++) {
+            UsbPortStatus status = mUsbManager.getPortStatus(ports[i]);
+            if (status.isConnected()) {
+                mPort = ports[i];
+                mPortStatus = status;
+                break;
+            }
+        }
+    }
+
+    public int getCurrentMode() {
+        if (mPort != null) {
+            int power = mPortStatus.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE
+                    ? MODE_POWER_SOURCE : MODE_POWER_SINK;
+            return power | getUsbDataMode();
+        }
+        return MODE_POWER_SINK | getUsbDataMode();
+    }
+
+    public int getUsbDataMode() {
+        if (!mIsUnlocked) {
+            return MODE_DATA_NONE;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
+            return MODE_DATA_MTP;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
+            return MODE_DATA_PTP;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) {
+            return MODE_DATA_MIDI;
+        }
+        return MODE_DATA_NONE; // ...
+    }
+
+    private void setUsbFunction(int mode) {
+        switch (mode) {
+            case MODE_DATA_MTP:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            case MODE_DATA_PTP:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            case MODE_DATA_MIDI:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            default:
+                mUsbManager.setCurrentFunction(null);
+                mUsbManager.setUsbDataUnlocked(false);
+                break;
+        }
+    }
+
+    public void setMode(int mode) {
+        if (mPort != null) {
+            int powerRole = modeToPower(mode);
+            // If we aren't using any data modes and we support host mode, then go to host mode
+            // so maybe? the other device can provide data if it wants, otherwise go into device
+            // mode because we have no choice.
+            int dataRole = (mode & MODE_DATA_MASK) == MODE_DATA_NONE
+                    && mPortStatus.isRoleCombinationSupported(powerRole, UsbPort.DATA_ROLE_HOST)
+                    ? UsbPort.DATA_ROLE_HOST : UsbPort.DATA_ROLE_DEVICE;
+            mUsbManager.setPortRoles(mPort, powerRole, dataRole);
+        }
+        setUsbFunction(mode & MODE_DATA_MASK);
+    }
+
+    private int modeToPower(int mode) {
+        return (mode & MODE_POWER_MASK) == MODE_POWER_SOURCE
+                    ? UsbPort.POWER_ROLE_SOURCE : UsbPort.POWER_ROLE_SINK;
+    }
+
+    public boolean isModeSupported(int mode) {
+        if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE
+                && (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {
+            // No USB data modes are supported.
+            return false;
+        }
+        if (mPort != null) {
+            int power = modeToPower(mode);
+            if ((mode & MODE_DATA_MASK) != 0) {
+                // We have a port and data, need to be in device mode.
+                return mPortStatus.isRoleCombinationSupported(power,
+                        UsbPort.DATA_ROLE_DEVICE);
+            } else {
+                // No data needed, we can do this power mode in either device or host.
+                return mPortStatus.isRoleCombinationSupported(power, UsbPort.DATA_ROLE_DEVICE)
+                        || mPortStatus.isRoleCombinationSupported(power, UsbPort.DATA_ROLE_HOST);
+            }
+        }
+        // No port, support sink modes only.
+        return (mode & MODE_POWER_MASK) != MODE_POWER_SOURCE;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index 4bdabd5..77fc388 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -20,13 +20,14 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.usb.UsbManager;
 import android.os.Bundle;
-import android.os.UserManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Checkable;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.android.settings.R;
 
@@ -36,83 +37,102 @@
  */
 public class UsbModeChooserActivity extends Activity {
 
-    private UsbManager mUsbManager;
-    private String[] mFunctions;
-    private boolean mIsUnlocked;
+    public static final int[] DEFAULT_MODES = {
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE,
+        UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI
+    };
+
+    private UsbBackend mBackend;
+    private AlertDialog mDialog;
+    private LayoutInflater mLayoutInflater;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        Intent i = getBaseContext().registerReceiver(null, new IntentFilter(UsbManager.ACTION_USB_STATE));
-        mIsUnlocked = i.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
 
         super.onCreate(savedInstanceState);
-        mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-        boolean isFileTransferRestricted = ((UserManager) getSystemService(Context.USER_SERVICE))
-                .hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
-        CharSequence[] items;
-        if (isFileTransferRestricted) {
-            items = new CharSequence[] { getText(R.string.usb_use_charging_only), getText(R.string.usb_use_MIDI)};
-            mFunctions = new String[] { null, UsbManager.USB_FUNCTION_MIDI };
-        } else {
-            items = new CharSequence[] {
-                    getText(R.string.usb_use_charging_only), getText(R.string.usb_use_file_transfers),
-                    getText(R.string.usb_use_photo_transfers), getText(R.string.usb_use_MIDI)};
-            mFunctions = new String[] { null, UsbManager.USB_FUNCTION_MTP,
-                    UsbManager.USB_FUNCTION_PTP, UsbManager.USB_FUNCTION_MIDI };
-        }
 
-        final AlertDialog levelDialog;
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.usb_use);
+        mLayoutInflater = LayoutInflater.from(this);
 
-        builder.setSingleChoiceItems(items, getCurrentFunction(),
-                new DialogInterface.OnClickListener() {
+        mDialog = new AlertDialog.Builder(this)
+                .setTitle(R.string.usb_use)
+                .setView(R.layout.usb_dialog_container)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        finish();
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (!ActivityManager.isUserAMonkey()) {
-                            setCurrentFunction(which);
-                        }
-                        dialog.dismiss();
-                        UsbModeChooserActivity.this.finish();
+                        finish();
                     }
-                });
-        builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                UsbModeChooserActivity.this.finish();
+                }).create();
+        mDialog.show();
+
+        LinearLayout container = (LinearLayout) mDialog.findViewById(R.id.container);
+
+        mBackend = new UsbBackend(this);
+        int current = mBackend.getCurrentMode();
+        for (int i = 0; i < DEFAULT_MODES.length; i++) {
+            if (mBackend.isModeSupported(DEFAULT_MODES[i])) {
+                inflateOption(DEFAULT_MODES[i], current == DEFAULT_MODES[i], container);
             }
-        });
-        builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                UsbModeChooserActivity.this.finish();
-            }
-        });
-        levelDialog = builder.create();
-        levelDialog.show();
+        }
     }
 
-    private int getCurrentFunction() {
-        if (!mIsUnlocked) {
-            return 0;
-        }
+    private void inflateOption(final int mode, boolean selected, LinearLayout container) {
+        View v = mLayoutInflater.inflate(R.layout.radio_with_summary, container, false);
 
-        for (int i = 1; i < mFunctions.length; i++) {
-            if (mUsbManager.isFunctionEnabled(mFunctions[i])) {
-                return i;
+        ((TextView) v.findViewById(android.R.id.title)).setText(getTitle(mode));
+        ((TextView) v.findViewById(android.R.id.summary)).setText(getSummary(mode));
+
+        v.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!ActivityManager.isUserAMonkey()) {
+                    mBackend.setMode(mode);
+                }
+                mDialog.dismiss();
+                finish();
             }
+        });
+        ((Checkable) v).setChecked(selected);
+        container.addView(v);
+    }
+
+    private static int getSummary(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only_desc;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI_desc;
         }
         return 0;
     }
 
-    private void setCurrentFunction(int which) {
-        if (which == 0) {
-            mUsbManager.setCurrentFunction(null);
-            mUsbManager.setUsbDataUnlocked(false);
-            return;
+    private static int getTitle(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI;
         }
-
-        mUsbManager.setCurrentFunction(mFunctions[which]);
-        mUsbManager.setUsbDataUnlocked(true);
+        return 0;
     }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index 430f220..d164800 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -28,6 +28,7 @@
 import android.widget.TextView;
 
 import com.android.settings.ChooseLockSettingsHelper;
+import com.android.settings.InstrumentedActivity;
 import com.android.settings.R;
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.view.NavigationBar;
@@ -35,24 +36,11 @@
 /**
  * Base activity for all fingerprint enrollment steps.
  */
-public class FingerprintEnrollBase extends Activity implements View.OnClickListener {
-
-    /**
-     * Used by the choose fingerprint wizard to indicate the wizard is
-     * finished, and each activity in the wizard should finish.
-     * <p>
-     * Previously, each activity in the wizard would finish itself after
-     * starting the next activity. However, this leads to broken 'Back'
-     * behavior. So, now an activity does not finish itself until it gets this
-     * result.
-     */
-    protected static final int RESULT_FINISHED = RESULT_FIRST_USER;
-
-    /**
-     * Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which
-     * will be useful if the user accidentally entered this flow.
-     */
-    protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;
+public abstract class FingerprintEnrollBase extends InstrumentedActivity
+        implements View.OnClickListener {
+    static final int RESULT_FINISHED = FingerprintSettings.RESULT_FINISHED;
+    static final int RESULT_SKIP = FingerprintSettings.RESULT_SKIP;
+    static final int RESULT_TIMEOUT = FingerprintSettings.RESULT_TIMEOUT;
 
     protected byte[] mToken;
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 5d4edbd..fe0bb63 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -29,6 +30,7 @@
 import android.graphics.drawable.Animatable2;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
@@ -38,6 +40,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 
@@ -244,9 +247,22 @@
     }
 
     @Override
-    public void onEnrollmentError(CharSequence errString) {
-        showError(errString);
+    public void onEnrollmentError(int errMsgId, CharSequence errString) {
+        int msgId;
+        switch (errMsgId) {
+            case FingerprintManager.FINGERPRINT_ERROR_TIMEOUT:
+                // This message happens when the underlying crypto layer decides to revoke the
+                // enrollment auth token.
+                msgId = R.string.security_settings_fingerprint_enroll_error_timeout_dialog_message;
+                break;
+            default:
+                // There's nothing specific to tell the user about. Ask them to try again.
+                msgId = R.string.security_settings_fingerprint_enroll_error_generic_dialog_message;
+                break;
+        }
+        showErrorDialog(getText(msgId), errMsgId);
         stopIconAnimation();
+        mErrorText.removeCallbacks(mTouchAgainRunnable);
     }
 
     @Override
@@ -277,6 +293,11 @@
         return PROGRESS_BAR_MAX * progress / (steps + 1);
     }
 
+    private void showErrorDialog(CharSequence msg, int msgId) {
+        ErrorDialog dlg = ErrorDialog.newInstance(msg, msgId);
+        dlg.show(getFragmentManager(), ErrorDialog.class.getName());
+    }
+
     private void showIconTouchDialog() {
         mIconTouchCount = 0;
         new IconTouchDialog().show(getFragmentManager(), null /* tag */);
@@ -380,6 +401,11 @@
         }
     };
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLLING;
+    }
+
     public static class IconTouchDialog extends DialogFragment {
 
         @Override
@@ -397,4 +423,49 @@
             return builder.create();
         }
     }
+
+    public static class ErrorDialog extends DialogFragment {
+
+        /**
+         * Create a new instance of ErrorDialog.
+         *
+         * @param msg the string to show for message text
+         * @param msgId the FingerprintManager error id so we know the cause
+         * @return a new ErrorDialog
+         */
+        static ErrorDialog newInstance(CharSequence msg, int msgId) {
+            ErrorDialog dlg = new ErrorDialog();
+            Bundle args = new Bundle();
+            args.putCharSequence("error_msg", msg);
+            args.putInt("error_id", msgId);
+            dlg.setArguments(args);
+            return dlg;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            CharSequence errorString = getArguments().getCharSequence("error_msg");
+            final int errMsgId = getArguments().getInt("error_id");
+            builder.setTitle(R.string.security_settings_fingerprint_enroll_error_dialog_title)
+                    .setMessage(errorString)
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dialog.dismiss();
+                                    boolean wasTimeout =
+                                        errMsgId == FingerprintManager.FINGERPRINT_ERROR_TIMEOUT;
+                                    Activity activity = getActivity();
+                                    activity.setResult(wasTimeout ?
+                                            RESULT_TIMEOUT : RESULT_FINISHED);
+                                    activity.finish();
+                                }
+                            });
+            AlertDialog dialog = builder.create();
+            dialog.setCanceledOnTouchOutside(false);
+            return dialog;
+        }
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index bbed42c..a6b0dca 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -21,6 +21,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 
@@ -79,6 +80,9 @@
             } else if (resultCode == RESULT_SKIP) {
                 setResult(RESULT_SKIP);
                 finish();
+            } else if (resultCode == RESULT_TIMEOUT) {
+                setResult(RESULT_TIMEOUT);
+                finish();
             } else {
                 FingerprintManager fpm = getSystemService(FingerprintManager.class);
                 int enrolled = fpm.getEnrolledFingerprints().size();
@@ -105,4 +109,9 @@
             finish();
         }
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_FIND_SENSOR;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
index 29f14d7..6691e20 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
@@ -25,6 +25,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
 
@@ -70,4 +71,9 @@
         }
         super.onClick(v);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_FINISH;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index de5bf24..beb1a8f 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -22,6 +22,7 @@
 import android.os.UserHandle;
 import android.view.View;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
@@ -92,4 +93,9 @@
                 getString(R.string.help_url_fingerprint), getClass().getName());
         startActivity(helpIntent);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_INTRO;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
index e81b0ff..0990459 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
@@ -21,6 +21,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
@@ -82,4 +83,9 @@
     protected Intent getFindSensorIntent() {
         return new Intent(this, FingerprintEnrollFindSensor.class);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index 6a47dc4..5feb08c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -24,12 +24,14 @@
 import android.os.CancellationSignal;
 import android.os.Handler;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
+import com.android.settings.InstrumentedFragment;
 
 /**
  * Sidecar fragment to handle the state around fingerprint enrollment.
  */
-public class FingerprintEnrollSidecar extends Fragment {
+public class FingerprintEnrollSidecar extends InstrumentedFragment {
 
     private int mEnrollmentSteps = -1;
     private int mEnrollmentRemaining = 0;
@@ -128,7 +130,7 @@
         @Override
         public void onEnrollmentError(int errMsgId, CharSequence errString) {
             if (mListener != null) {
-                mListener.onEnrollmentError(errString);
+                mListener.onEnrollmentError(errMsgId, errString);
             }
         }
     };
@@ -140,9 +142,14 @@
         }
     };
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_SIDECAR;
+    }
+
     public interface Listener {
         void onEnrollmentHelp(CharSequence helpString);
-        void onEnrollmentError(CharSequence errString);
+        void onEnrollmentError(int errMsgId, CharSequence errString);
         void onEnrollmentProgressChange(int steps, int remaining);
     }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index a5c9963..cacd5dd 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -70,8 +70,9 @@
  * Settings screen for fingerprints
  */
 public class FingerprintSettings extends SubSettings {
+
     /**
-     * Used by the FP settings wizard to indicate the wizard is
+     * Used by the choose fingerprint wizard to indicate the wizard is
      * finished, and each activity in the wizard should finish.
      * <p>
      * Previously, each activity in the wizard would finish itself after
@@ -79,7 +80,21 @@
      * behavior. So, now an activity does not finish itself until it gets this
      * result.
      */
-    static final int RESULT_FINISHED = RESULT_FIRST_USER;
+    protected static final int RESULT_FINISHED = RESULT_FIRST_USER;
+
+    /**
+     * Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which
+     * will be useful if the user accidentally entered this flow.
+     */
+    protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;
+
+    /**
+     * Like {@link #RESULT_FINISHED} except this one indicates enrollment failed because the
+     * device was left idle. This is used to clear the credential token to require the user to
+     * re-enter their pin/pattern/password before continuing.
+     */
+    protected static final int RESULT_TIMEOUT = RESULT_FIRST_USER + 2;
+
     private static final long LOCKOUT_DURATION = 30000; // time we have to wait for fp to reset, ms
 
     @Override
@@ -181,6 +196,7 @@
                     case MSG_REFRESH_FINGERPRINT_TEMPLATES:
                         removeFingerprintPreference(msg.arg1);
                         updateAddPreference();
+                        retryFingerprint();
                     break;
                     case MSG_FINGER_AUTH_SUCCESS:
                         mFingerprintCancel = null;
@@ -440,6 +456,12 @@
                                 ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                     }
                 }
+            } else if (requestCode == ADD_FINGERPRINT_REQUEST) {
+                if (resultCode == RESULT_TIMEOUT) {
+                    Activity activity = getActivity();
+                    activity.setResult(RESULT_TIMEOUT);
+                    activity.finish();
+                }
             }
 
             if (mToken == null) {
@@ -480,10 +502,10 @@
                 highlight.setHotspot(centerX, centerY);
                 view.setBackground(highlight);
                 view.setPressed(true);
+                view.setPressed(false);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        view.setPressed(false);
                         view.setBackground(null);
                     }
                 }, RESET_HIGHLIGHT_DELAY_MS);
@@ -556,6 +578,9 @@
                                             if (DEBUG) {
                                                 Log.v(TAG, "rename " + name + " to " + newName);
                                             }
+                                            MetricsLogger.action(getContext(),
+                                                    MetricsLogger.ACTION_FINGERPRINT_RENAME,
+                                                    mFp.getFingerId());
                                             FingerprintSettingsFragment parent
                                                     = (FingerprintSettingsFragment)
                                                     getTargetFragment();
@@ -598,6 +623,8 @@
 
             private void onDeleteClick(DialogInterface dialog) {
                 if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId());
+                MetricsLogger.action(getContext(), MetricsLogger.ACTION_FINGERPRINT_DELETE,
+                        mFp.getFingerId());
                 FingerprintSettingsFragment parent
                         = (FingerprintSettingsFragment) getTargetFragment();
                 if (parent.mFingerprintManager.getEnrolledFingerprints().size() > 1) {
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index fc7b803..b57bb8d 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -16,18 +16,29 @@
 
 package com.android.settings.fingerprint;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.setupwizardlib.util.SystemBarHelper;
 import com.android.setupwizardlib.view.NavigationBar;
 
 public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
         implements NavigationBar.NavigationBarListener {
 
+    private static final String TAG_DIALOG = "dialog";
+
     @Override
     protected Intent getFinishIntent() {
         final Intent intent = new Intent(this, SetupFingerprintEnrollFinish.class);
@@ -68,7 +79,53 @@
 
     @Override
     public void onNavigateNext() {
-        setResult(RESULT_SKIP);
-        finish();
+        new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLLING_SETUP;
+    }
+
+    public static class SkipDialog extends DialogFragment {
+
+        @Override
+        public void show(FragmentManager manager, String tag) {
+            if (manager.findFragmentByTag(tag) == null) {
+                super.show(manager, tag);
+            }
+        }
+
+        public SkipDialog() {
+            // no-arg constructor for fragment
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
+                    .setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.wifi_skip_anyway,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    Activity activity = getActivity();
+                                    if (activity != null) {
+                                        activity.setResult(RESULT_SKIP);
+                                        activity.finish();
+                                    }
+                                }
+                            })
+                    .setNegativeButton(R.string.wifi_dont_skip,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
+                    .create();
+            SystemBarHelper.hideSystemBars(dialog);
+            return dialog;
+        }
     }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index 17c0671..1483c83 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
@@ -70,4 +71,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_FIND_SENSOR_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index 351cd57..8f37a11 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -22,6 +22,7 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
@@ -78,4 +79,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_FINISH_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index 416d53f..c7e39e5 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.setupwizardlib.view.NavigationBar;
@@ -74,4 +75,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_INTRO_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
index bee0cde..7fca35a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.SetupWizardUtils;
@@ -75,4 +76,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD_SETUP;
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1a4b1dd..774c54b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -458,9 +458,17 @@
                 String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
                 if (clientCert.equals(unspecifiedCert)) clientCert = "";
                 config.enterpriseConfig.setClientCertificateAlias(clientCert);
-                config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
-                config.enterpriseConfig.setAnonymousIdentity(
-                        mEapAnonymousView.getText().toString());
+                if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) {
+                    config.enterpriseConfig.setIdentity("");
+                    config.enterpriseConfig.setAnonymousIdentity("");
+                } else if (eapMethod == Eap.PWD) {
+                    config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
+                    config.enterpriseConfig.setAnonymousIdentity("");
+                } else {
+                    config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
+                    config.enterpriseConfig.setAnonymousIdentity(
+                            mEapAnonymousView.getText().toString());
+                }
 
                 if (mPasswordView.isShown()) {
                     // For security reasons, a previous password is not displayed to user.