Merge "Introduce ShowTapsPreferenceController"
diff --git a/res/layout/write_wifi_config_to_nfc.xml b/res/layout/write_wifi_config_to_nfc.xml
index 9b19df7..3c39ad1 100644
--- a/res/layout/write_wifi_config_to_nfc.xml
+++ b/res/layout/write_wifi_config_to_nfc.xml
@@ -15,53 +15,62 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/wifi_section">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fadeScrollbars="false"
+ android:scrollIndicators="top|bottom">
- <LinearLayout android:id="@+id/password_layout"
- style="@style/wifi_item"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dip"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/password_label"
- style="?android:attr/textAppearanceSmall"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="4dip"
- android:text="@string/wifi_password" />
-
- <EditText android:id="@+id/password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:password="true"
- android:maxLength="63"
- android:imeOptions="flagForceAscii" />
- <TextView
- style="@style/wifi_item_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <CheckBox android:id="@+id/show_password"
- style="@style/wifi_item_content"
- android:textSize="14sp"
- android:text="@string/wifi_show_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- </LinearLayout>
-
-
- <ProgressBar
- android:id="@+id/progress_bar"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|center_horizontal"
- android:padding="8dip"
- android:visibility="gone"
- style="@android:style/Widget.ProgressBar.Large" />
+ style="@style/wifi_section">
-</LinearLayout>
+ <LinearLayout android:id="@+id/password_layout"
+ style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="8dip"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/password_label"
+ style="?android:attr/textAppearanceSmall"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dip"
+ android:text="@string/wifi_password" />
+
+ <EditText android:id="@+id/password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:password="true"
+ android:maxLength="63"
+ android:imeOptions="flagForceAscii" />
+ <TextView
+ style="@style/wifi_item_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <CheckBox android:id="@+id/show_password"
+ style="@style/wifi_item_content"
+ android:textSize="14sp"
+ android:text="@string/wifi_show_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+
+
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center_horizontal"
+ android:padding="8dip"
+ android:visibility="gone"
+ style="@android:style/Widget.ProgressBar.Large" />
+
+ </LinearLayout>
+</ScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 755f045..504b696 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon vir vingerafdruk"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel \'n PIN vir sekuriteit"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel PIN vir vingerafdruk"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel \'n patroon vir sekuriteit"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Voer jou wagwoord weer in"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Voer jou PIN weer in"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b372f8b..919d722 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ለደህንነት አንድ ፒን ያቀናብሩ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"የጣት አሻራን ለመጠቀም ፒን ያቀናብሩ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ለደህንነት ሲባል፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"የእርስዎን ይለፍ ቃል ደግመው ያስገቡ"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"የእርስዎን ፒን ደግመው ያስገቡ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3d82b2c..0ba1047 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -395,7 +395,7 @@
<string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته."</string>
<string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته."</string>
<string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته."</string>
- <string name="skip_anyway_button_label" msgid="2323522873558834513">"التخطي على أي حال"</string>
+ <string name="skip_anyway_button_label" msgid="2323522873558834513">"تخطّي"</string>
<string name="go_back_button_label" msgid="4745265266186209467">"رجوع"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"لمس المستشعر"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"المستشعر موجود على الجزء الخلفي لهاتفك. استخدم إصبع السبابة."</string>
@@ -567,7 +567,7 @@
<string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف الملف الشخصي للعمل وبياناته."</string>
<string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"تجاهل"</string>
<string name="lockpassword_password_too_short" msgid="2726090378672764986">"يجب أن تحتوي كلمة المرور على <xliff:g id="COUNT">%d</xliff:g> من الأحرف على الأقل"</string>
- <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> من الأرقام على الأقل"</string>
+ <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> أرقام على الأقل"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
<string name="lockpassword_password_too_long" msgid="4591720174765403476">"يجب ألا تزيد كلمة المرور عن <xliff:g id="NUMBER">%d</xliff:g> من الأحرف"</string>
<string name="lockpassword_pin_too_long" msgid="2079396149560490458">"يجب ألا يزيد رقم التعريف الشخصي عن <xliff:g id="NUMBER">%d</xliff:g> من الأرقام"</string>
@@ -1527,8 +1527,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"لاستخدام بصمة الإصبع، يُرجى رسم نقش من ابتكارك"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"يجب تعيين رقم تعريف شخصي لأغراض أمنية"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"لاستخدام بصمة الإصبع، عيّن رقم التعريف الشخصي"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"لضمان مستوى الأمان، يُرجى تعيين نقش"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"أعد إدخال كلمة المرور"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأكيد نقشك"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"أعد إدخال رقم التعريف الشخصي"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 10bc6aa..d1f1ca5 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmaq izi üçün nümunə seçin"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Təhlükəsizlik üçün PIN ayarlayın"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmaq izi üçün PIN ayarlayın"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Təhlükəsizlik üçün nümunə ayarlayın"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolu yenidən daxil edin."</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Modeli təsdiq edin"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'i yenidən daxil edin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0fa5dc2..f88c1b4 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Podesite šablon da biste koristili otisak"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Podesite PIN iz bezbednosnih razloga"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Podesite PIN da biste koristili otisak"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Podesite šablon iz bezbednosnih razloga"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite šablon"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7abf1a3..d9d4bb1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1502,8 +1502,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Спачатку задайце ўзор"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Для большай бяспекі задайце PIN-код"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Каб карыст. адбіт. пальца, задайце PIN-код"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Для большай бяспекі задайце ўзор"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Увядзіце пароль яшчэ раз"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Пацвердзіце ўзор"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Увядзіце PIN-код яшчэ раз"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c6d0fff..e6d2787 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте фигура, за да ползвате отпечатък"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"От съображения за сигурност задайте ПИН код"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте ПИН, за да ползвате отпечатък"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"От съображения за сигурност задайте фигура"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Въведете отново паролата си"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потвърдете фигурата си"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Въведете отново ПИН кода си"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1c79aaa..db63d91 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"আঙ্গুলের ছাপ ব্যবহার করার জন্য প্যাটার্ন সেট করুন"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পিন সেট করুন"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"নিরাপত্তার জন্য একটি প্যাটার্ন সেট করুন"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"আপনার পাসওয়ার্ডটি আবার লিখুন"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"আপনার প্যাটার্ন নিশ্চিত করুন"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"আপনার পিনটি আবার লিখুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b8593e9..12c995d 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1238,9 +1238,9 @@
<string name="usb_mtp_title" msgid="3399663424394065964">"Medijski uređaj (MTP)"</string>
<string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava prenošenje medijskih fajlova u Windows ili korištenje Android File Transfer aplikacije za Mac (pogledajte www.android.com/filetransfer)"</string>
<string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
- <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na kompjutere koji ne podržavaju MTP"</string>
+ <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na računare koji ne podržavaju MTP"</string>
<string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
- <string name="usb_midi_summary" msgid="539169474810956358">"Omogućava da MIDI omogućene aplikacije rade preko USB-a sa MIDI softverom na vašem kompjuteru."</string>
+ <string name="usb_midi_summary" msgid="539169474810956358">"Omogućava da MIDI omogućene aplikacije rade preko USB-a sa MIDI softverom na vašem računaru."</string>
<string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
<string name="storage_internal_title" msgid="690771193137801021">"Uređaj za memoriju"</string>
<string name="storage_external_title" msgid="3433462910096848696">"Prenosiva memorija"</string>
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Postavite PIN kôd radi sigurnosti"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Da koristite otisak prsta, postavite PIN kôd"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Postavite uzorak radi sigurnosti"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN kôd"</string>
@@ -2788,7 +2787,7 @@
<string name="search_menu" msgid="6283419262313758339">"Pretraži postavke"</string>
<string name="query_hint_text" msgid="3350700807437473939">"Pretraži postavke"</string>
<string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, mrežne veze"</string>
- <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstualna poruka, slanje tekstualnih poruka, poruke, slanje poruka"</string>
+ <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, slanje SMS-ova, poruke, slanje poruka"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilni, mobilni operater, bežični, podaci, 4g, 3g, 2g, lte"</string>
<string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, pozovi, pozivanje"</string>
<string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 07577ac..e6ab7e0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defineix un patró"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motius de seguretat, cal que defineixis un PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defineix un PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per motius de seguretat, cal que defineixis un patró"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Torna a introduir la contrasenya"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Torna a introduir el PIN"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e3c6a29..6b90f42 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisk vyžaduje nastavení gesta"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostních důvodů nastavte PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisk vyžaduje nastavení PINu"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostních důvodů nastavte gesto"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znovu zadejte heslo"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte své gesto"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znovu zadejte PIN"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 243c948..bbf96c3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angiv mønster for at bruge fingeraftryk"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Konfigurer en pinkode af hensyn til sikkerheden"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angiv pinkode for at bruge fingeraftryk"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angiv et mønster af hensyn til sikkerheden"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angiv din adgangskode igen"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angiv din pinkode igen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5ceb528..b17a703 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Muster festlegen, um Fingerabdruck zu verwenden"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Richte aus Sicherheitsgründen eine PIN ein"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Richte aus Sicherheitsgründen ein Muster ein"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Passwort noch einmal eingeben"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN noch einmal eingeben"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7d06404..c9b4440 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Για χρήση δακτ. αποτ. ορίστε μοτίβο"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Για λόγους ασφαλείας, ορίστε έναν αριθμό PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Για χρήση δακτ. αποτ. ορίστε αρ. PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Για λόγους ασφαλείας, ορίστε ένα μοτίβο"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Εισαγάγετε ξανά τον κωδικό πρόσβασής σας"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Επιβεβαίωση μοτίβου"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Εισαγάγετε ξανά τον αριθμό PIN"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index accb94a..c401244 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 2059824..2338b5d 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index accb94a..c401244 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index accb94a..c401244 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 53e7c0f..1ea8bcc 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1474,8 +1474,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 881b139..5365c40 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Configura el patrón"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de seguridad, establece un PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Configura el PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por razones de seguridad, configura un patrón"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a ingresar tu contraseña"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Vuelve a ingresar el PIN"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1fa7020..c157249 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1471,12 +1471,11 @@
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
<string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece el bloqueo de pantalla"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por seguridad, establece una contraseña"</string>
- <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar huella, añade contraseña"</string>
+ <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar la huella, añade una contraseña"</string>
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar huellas, añade un patrón"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por seguridad, establece un PIN"</string>
- <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar huella, añade PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar la huella, añade un PIN"</string>
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por seguridad, establece un patrón"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a introducir tu contraseña"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Vuelve a introducir tu PIN"</string>
@@ -3504,7 +3503,7 @@
<string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
<string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer límite de frecuencia de ShortcutManager"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Se ha restablecido el límite de frecuencia de ShortcutManager"</string>
- <string name="notification_suggestion_title" msgid="387052719462473500">"Controla los datos que aparecen en la pantalla de bloqueo"</string>
+ <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla de bloqueo"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
<string name="page_tab_title_support" msgid="8483187649355540109">"Ayuda y consejos"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b30ddb7..dac90df 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sõrmejälje kasutamiseks määrake muster"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Turvalisuse huvides määrake PIN-kood"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Turvalisuse huvides määrake muster"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sisestage oma parool uuesti"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Mustri kinnitamine"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sisestage oma PIN-kood uuesti"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index b4bd196..fa778a2 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Hatz-marka erabiltzeko, ezarri eredua"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Babestuta egoteko, ezarri PIN bat"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Segurtasuna bermatzeko, zehaztu eredua"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Idatzi berriro pasahitza"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Berretsi eredua"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Idatzi berriro PIN kodea"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dd3a48e..c160274 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"تنظیم الگو برای استفاده از اثر انگشت"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"برای حفظ امنیت، پین تنظیم کنید"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"تنظیم پین برای استفاده از اثر انگشت"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"برای حفظ امنیت، الگو تنظیم کنید"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"گذرواژه خود را دوباره وارد کنید"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأیید الگو"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"پین خود را دوباره وارد کنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1285f77..08c26e5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -758,7 +758,7 @@
<string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
<string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
<string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
- <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora Wi-Fi-yhteys"</string>
+ <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
<string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
<string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
<string name="wifi_menu_configure" msgid="6150926852602171938">"Määritä"</string>
@@ -873,7 +873,7 @@
<string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
<string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
<string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
- <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora Wi-Fi-yhteys"</string>
+ <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
<string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
<string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
<string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sormenjälki: aseta kuvio"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Aseta PIN-koodi suojauksen parantamiseksi."</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sormenjälki: aseta PIN-koodi"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Aseta kuvio suojauksen parantamiseksi."</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Anna salasana uudelleen"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Anna PIN-koodi uudelleen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7441903..243277d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser empreinte digitale, configurer schéma"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour plus de sécurité, définissez un NIP"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour util. empr. digit., config. NIP"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour plus de sécurité, définissez un schéma de verrouillage"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Entrez de nouveau votre mot de passe"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Entrez de nouveau votre NIP"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 515030f..49e842c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser votre empreinte, définissez un schéma"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour des raisons de sécurité, définissez un code"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour utiliser votre empreinte, définissez un code PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour des raisons de sécurité, définissez un schéma"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Saisissez de nouveau votre mot de passe"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Saisissez de nouveau votre code"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index e383cce..b1e5eef 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Impresión dixital: padrón"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por cuestións de seguranza, configura un PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Impresión dixital: PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por cuestións de seguranza, define un padrón"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Volve introducir o teu contrasinal"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma o teu padrón"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Volve introducir o teu PIN"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 32105e5..b30e7bb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ફિંગરપ્રિન્ટ વાપરવા પૅટર્ન સેટ કરો"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"સુરક્ષા માટે, પિન સેટ કરો"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ફિંગરપ્રિન્ટ વાપરવા પિન સેટ કરો"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"સુરક્ષાના કારણસર, એક પૅટર્ન સેટ કરો"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"તમારો પિન ફરી દાખલ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index cc51223..be6ded2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -275,7 +275,7 @@
<string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
<string name="proxy_settings_label" msgid="3271174136184391743">"प्रॉक्सी सेटिंग"</string>
<string name="cancel" msgid="6859253417269739139">"रद्द करें"</string>
- <string name="okay" msgid="1997666393121016642">"ठीक"</string>
+ <string name="okay" msgid="1997666393121016642">"ठीक है"</string>
<string name="forget" msgid="1400428660472591263">"भूल जाएं"</string>
<string name="save" msgid="879993180139353333">"सेव करें"</string>
<string name="done" msgid="6942539184162713160">"हो गया"</string>
@@ -389,7 +389,7 @@
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
- <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
+ <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक है"</string>
<string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"मिटाएं"</string>
<string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसर को छुएं"</string>
<string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन (वाइब्रेशन) महसूस होने पर उठा लें"</string>
@@ -1250,7 +1250,7 @@
<string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्पिक रूप से, यदि डिवाइस उपलब्ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्स पुन: इंस्टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहित किया गया उनका डेटा खो जाएगा."</string>
<string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
<string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
- <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप्स"</string>
+ <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप"</string>
<string name="storage_detail_images" msgid="6950678857740634769">"चित्र"</string>
<string name="storage_detail_videos" msgid="2919743464827110953">"वीडियो"</string>
<string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फ़िंगरप्रिंट का उपयोग करने के लिए, पैटर्न सेट करें"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षा के लिए, पिन सेट करें"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फ़िंगरप्रिंट का उपयोग करने के लिए, पिन सेट करें"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षा के लिए कोई पैटर्न सेट करें"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"पासवर्ड फिर से दर्ज करें"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने पैटर्न की पुष्टि करें"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"पिन फिर से दर्ज करें"</string>
@@ -1700,7 +1699,7 @@
<string name="running_processes_header_title" msgid="6588371727640789560">"डिवाइस की मेमोरी"</string>
<string name="running_processes_header_footer" msgid="723908176275428442">"ऐप्स RAM उपयोग"</string>
<string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्टम"</string>
- <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप्स"</string>
+ <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप"</string>
<string name="running_processes_header_free_prefix" msgid="4620613031737078415">"खाली"</string>
<string name="running_processes_header_used_prefix" msgid="5924288703085123978">"उपयोग की गई"</string>
<string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"संचित"</string>
@@ -3290,7 +3289,7 @@
<string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> वर्णों का उपयोग किया गया"</string>
<string name="draw_overlay" msgid="6564116025404257047">"दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="system_alert_window_settings" msgid="8466613169103527868">"दूसरे ऐप के ऊपर दिखाएं"</string>
- <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप्स"</string>
+ <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप"</string>
<string name="system_alert_window_access_title" msgid="6297115362542361241">"दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="app_overlay_permission_preference" msgid="9039432222453006038">"ऊपर दिखाई देने वाले ऐप्लिकेशन की अनुमति"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bf2b5ee..4c13262 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisak prsta zahtijeva uzorak"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Radi sigurnosti postavite PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisak prsta zahtijeva PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Radi sigurnosti postavite uzorak"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovni unos zaporke"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovni unos PIN-a"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 95305e4..be392bc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Minta az ujjlenyomathoz"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"A biztonság érdekében állítson be PIN-kódot"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-kód az ujjlenyomathoz"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"A biztonság érdekében állítson be mintát"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Adja meg újra a jelszót"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Adja meg újra a PIN-kódot"</string>
@@ -3506,7 +3505,7 @@
<string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Törlés és konvertálás"</string>
<string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Visszaállítja a ShortcutManager gyakoriságkorlátozását"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"A ShortcutManager gyakoriságkorlátozása visszaállítva"</string>
- <string name="notification_suggestion_title" msgid="387052719462473500">"A lezárási képernyőn megjelenített adatok kezelése"</string>
+ <string name="notification_suggestion_title" msgid="387052719462473500">"A lezárási képernyő adatainak kezelése"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"Összes"</string>
<string name="page_tab_title_support" msgid="8483187649355540109">"Súgó és tippek"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5555e0d..6db3c39 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Մատնահետքն օգտագործելու համար ստեղծեք նախշ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք PIN կոդ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Մատնահետքն օգտագործելու համար տեղադրեք PIN կոդ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք նախշ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Նորից մուտքագրեք գաղտնաբառը"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Հաստատեք ձեր կաղապարը"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Նորից մուտքագրեք PIN կոդը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3ef071e..dddfd4f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Setel pola untuk fitur sidik jari"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Untuk keamanan, setel PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Setel PIN guna memakai sidik jari"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Untuk keamanan, setel pola"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan ulang sandi"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan ulang PIN"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 1328845..795c621 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Mynstur þarf fyrir fingrafar"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Settu upp PIN-númer til að gæta fyllsta öryggis"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-númer þarf fyrir fingrafar"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Settu upp mynstur til að gæta fyllsta öryggis"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sláðu aðgangsorðið inn aftur"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Staðfestu mynstrið"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sláðu PIN-númerið inn aftur"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cdd770a..24915ce 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Per usare l\'impronta digitale, imposta la sequenza"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motivi di sicurezza, imposta un PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Per usare l\'impronta digitale, imposta il PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per sicurezza, imposta una sequenza"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Inserisci di nuovo la password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Inserisci di nuovo il PIN"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9f0f0df..91b112e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"לטביעת האצבע נדרש קו ביטול נעילה"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"לשיפור האבטחה, מומלץ להגדיר קוד גישה"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"כאמצעי גיבוי, הגדר קוד גישה"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"מטעמי אבטחה, יש להגדיר קו ביטול נעילה"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"יש להזין את הסיסמה שוב"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"אשר את הקו לביטול נעילה"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"יש להזין שוב את קוד הגישה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 71fa9d4..9ecbbf6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"指紋認証にはパターンが必要です"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"セキュリティを強化するには、PIN を設定してください"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"指紋認証には PIN が必要です"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"セキュリティを強化するために、パターンを設定してください"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"パスワードの再入力"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"パターンの確認"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN の再入力"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a47a9aa..794facb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"თითის ანაბეჭდისთვის დააყენეთ ნიმუში"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"უსაფრთხოებისთვის, დააყენეთ PIN-კოდი"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ PIN-კოდი"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"უსაფრთხოებისთვის, დააყენეთ განსაბლოკი ნიმუში"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ხელახლა შეიყვანეთ თქვენი პაროლი"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"დაადასტურეთ ნიმუში"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ხელახლა შეიყვანეთ თქვენი PIN-კოდი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 54eb565..94c1c9b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Саусақ ізін пайдалану үшін PIN кодын пайдаланыңыз"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Қауіпсіздік үшін өрнекті орнатыңыз"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Құпия сөзді қайта енгізіңіз"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Өрнекті растаңыз"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN кодын қайта енгізіңіз"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 439a9cb..6d16056 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បីប្រើស្នាមម្រាមដៃ សូមកំណត់លំនាំ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ដើម្បីទទួលបានសុវត្ថិភាព សូមកំណត់កូដ PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ដើម្បីប្រើប្រាស់ស្នាមម្រាមដៃ សូមកំណត់កូដ PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ដើម្បីសុវត្ថិភាព សូមកំណត់លំនាំ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"បញ្ចូលពាក្យសម្ងាត់របស់អ្នកម្តងទៀត"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"បញ្ជាក់លំនាំដើមរបស់អ្នក"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"បញ្ចូលកូដ PIN របស់អ្នកម្តងទៀត"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 8a26bb2..bc7967f 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -21,7 +21,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="timezone_filters">
- <item msgid="5296756001147094692">"ಅಮೆರಿಕಾ"</item>
+ <item msgid="5296756001147094692">"ಅಮೆರಿಕ"</item>
<item msgid="3005562397632768392">"ಯೂರೋಪ್"</item>
<item msgid="5696915123093701218">"ಆಫ್ರಿಕಾ"</item>
<item msgid="4439789052790868249">"ಏಷ್ಯಾ"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 6c85260..a4ff8b1 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪ್ಯಾಟ್ರನ್ ಹೊಂದಿಸಿ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ನಿಮ್ಮ ಪಿನ್ ಅನ್ನು ಮರು ನಮೂದಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4e06026..a8e7bbc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"지문 사용 전 입력할 패턴 설정"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"보안을 위해 PIN을 설정하세요."</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN을 설정하여 지문 사용"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"보안을 위해 패턴을 설정하세요."</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"비밀번호 다시 입력"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"패턴 확인"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN 다시 입력"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 99684c9..bd5dc88 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1474,8 +1474,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Манжа изин колдонуу үчүн графикалык ачкычты жөндөңүз"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Коопсуздук үчүн PIN код коюп алыңыз"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Коопсуздук үчүн графикалык ачкыч коюп алыңыз"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Сырсөзүңүздү кайра киргизиңиз"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Графикалык ачкычыңызды ырастаңыз"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN кодуңузду кайра киргизиңиз"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 07b5166..016dbe2 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດ PIN ໄວ້"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ກະລຸນາຕັ້ງຮູບແບບປົດລັອກເພື່ອຄວາມປອດໄພ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານອີກຄັ້ງ"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ຢືນຢັນຮູບແບບຂອງທ່ານ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ໃສ່ລະຫັດ PIN ຂອງທ່ານອີກຄັ້ງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 31afeb7..3a80657 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nust. atrak. pieš., kad gal. naud. kont. kodą"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kad užtikrintumėte saugumą, nustatykite PIN kodą"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kad užtikrintumėte saugumą, nubrėžkite atrakinimo piešinį"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Įveskite slaptažodį iš naujo"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite piešinį"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Įveskite PIN kodą iš naujo"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9279824..5c60e4e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Kombinācijas iestatīšana"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Drošības nolūkos iestatiet PIN."</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN pirksta nosp. lietošanai"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Drošības nolūkos iestatiet kombināciju."</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Atkārtota paroles ievade"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Apstipriniet kombināciju"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Atkārtota PIN ievade"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5c4a2dc..be6006f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Поставете шема за отпечаток"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"За безбедност, поставете PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Поставете PIN за отпечаток"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"За безбедност, поставете шема"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Внесете ја лозинката повторно"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдете ја шемата"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Внесете го PIN-кодот повторно"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 006c6b7..505dcb3 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാറ്റേൺ സജ്ജമാക്കുക"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"സുരക്ഷയ്ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജമാക്കുക"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"സുരക്ഷയ്ക്കായി, ഒരു പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"നിങ്ങളുടെ പാസ്വേഡ് വീണ്ടും നൽകുക"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"നിങ്ങളുടെ പിൻ വീണ്ടും നൽകുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 42bed6c..7b7068d 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Хурууны хээ ашиглахын тулд загвар тохируулах"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Аюулгүйн үүднээс ПИН тохируулах"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Хурууны хээ ашиглахын тулд ПИН тохируулах"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Аюулгүй байдлын үүднээс загвар тохируулна уу"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Нууц үгээ дахин оруулах"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Хээгээ баталгаажуулна уу"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ПИН-ээ дахин оруулах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e36ea5e..df5eee0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1437,7 +1437,7 @@
<string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
<string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपले स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर अॅप्सना GPS वापरु द्या"</string>
<string name="location_street_level" product="default" msgid="4617445745492014203">"आपले स्थान सूचित करण्यासाठी आपल्या फोनवर अॅप्सना GPS वापरु द्या"</string>
- <string name="assisted_gps" msgid="4649317129586736885">"सहाय्यक GPS वापरा"</string>
+ <string name="assisted_gps" msgid="4649317129586736885">"साहाय्यक GPS वापरा"</string>
<string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
<string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
<string name="use_location_title" msgid="5206937465504979977">"स्थान आणि Google शोध"</string>
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिंट वापरण्यासाठी पॅटर्न सेट करा"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षिततेसाठी पिन सेट करा"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिंट वापरण्यासाठी पिन सेट करा"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षिततेसाठी, एक पॅटर्न सेट करा"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"तुमचा पासवर्ड पुन्हा टाका"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"आपल्या नमुन्याची पुष्टी करा"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"तुमचा पिन पुन्हा टाका"</string>
@@ -2910,7 +2909,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"सर्वाधिक महत्व"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"त्वरित महत्त्व"</string>
- <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहाय्यक"</string>
+ <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना साहाय्यक"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना प्रवेश"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइल सूचनांचा अॅक्सेस ब्लॉक आहे"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"अॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
@@ -3167,8 +3166,8 @@
<string name="default_for_work" msgid="9152194239366247932">"कार्यासाठी डीफॉल्ट"</string>
<string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहाय्य आणि व्हॉइस इनपुट"</string>
<string name="default_assist_title" msgid="8868488975409247921">"साहाय्य अॅप"</string>
- <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला सहाय्यक बनवायचे?"</string>
- <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्या स्क्रीनवर दृश्यमान असलेली किंवा अॅप्समध्ये प्रवेश करण्यायोग्य माहितीसह, आपल्या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्यात सहाय्यक सक्षम असेल."</string>
+ <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला साहाय्यक बनवायचे?"</string>
+ <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्या स्क्रीनवर दृश्यमान असलेली किंवा अॅप्समध्ये प्रवेश करण्यायोग्य माहितीसह, आपल्या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्यात साहाय्यक सक्षम असेल."</string>
<string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत आहे"</string>
<string name="assistant_security_warning_disagree" msgid="877419950830205913">"सहमत नाही"</string>
<string name="choose_voice_input_title" msgid="975471367067718019">"व्हॉइस इनपुट निवडा"</string>
@@ -3248,12 +3247,12 @@
<string name="background_check_pref" msgid="7550258400138010979">"पार्श्वभूमी तपासणे"</string>
<string name="background_check_title" msgid="4534254315824525593">"पूर्ण पार्श्वभूमी प्रवेश"</string>
<string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीनवरील मजकूर वापरा"</string>
- <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+ <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
<string name="assist_access_screenshot_title" msgid="4034721336291215819">"स्क्रीनशॉट वापरा"</string>
- <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+ <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
<string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ्लॅश करा"</string>
<string name="assist_flash_summary" msgid="9160668468824099262">"साहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूरअॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
- <string name="assist_footer" msgid="1982791172085896864">"सहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
+ <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
<string name="average_memory_use" msgid="829566450150198512">"सरासरी मेमरी वापर"</string>
<string name="maximum_memory_use" msgid="7493720799710132496">"कमाल मेमरी वापर"</string>
<string name="memory_usage" msgid="1781358557214390033">"मेमरी वापर"</string>
@@ -3331,7 +3330,7 @@
<string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
<string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"हाय पीट!"</string>
<string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"अरे, आज कॉफी प्यायला चलायचं?"</string>
- <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहित आहे."</string>
+ <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहीत आहे."</string>
<string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"छान!"</string>
<string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"मंगळवारी 6:00PM वाजता"</string>
<string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"मंगळवारी 6:01PM वाजता"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 11fe760..d316afd 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Buat corak utk guna cap jari"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Sebagai langkah keselamatan, tetapkan PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ttpkn PIN utk gunakan cap jari"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Sebagai langkah keselamatan, tetapkan corak"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan semula kata laluan anda"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan semula PIN anda"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index db54f4d..9128239 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"လက်ဗွေသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"လုံခြုံရေးအတွက် ပင်နံပါတ်တစ်ခု သတ်မှတ်ပါ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"လက်ဗွေသုံးရန် ပင်သတ်မှတ်ပါ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"လုံခြုံရေးအတွက် ပုံစံတစ်ခု သတ်မှတ်ပါ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"သင့်စကားဝှက်ကို ပြန်ထည့်ပါ"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"သင့်ပင်နံပါတ်ကို ပြန်ထည့်ပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9d34307..2049750 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angi mønster for å bruke fingeravtrykk"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Angi en PIN-kode for sikkerheten"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angi PIN for å bruke fingeravtrykk"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angi et mønster for sikkerheten"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angi passordet på nytt"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønsteret"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angi PIN-koden på nytt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c9b9aa8..c8dc8cd 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षाका लागि एउटा PIN सेट गर्नुहोस्"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षाका लागि कुनै ढाँचा सेट गर्नुहोस्"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"आफ्नो पासवर्ड पुन: प्रविष्ट गर्नुहोस्"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"आफ्नो PIN पुन: प्रविष्ट गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f2f5481..d0c00d1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon in voor gebruik van vingerafdruk"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel een pincode in voor betere beveiliging"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel pincode in voor gebruik van vingerafdruk"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel een patroon in voor betere beveiliging"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Geef je wachtwoord opnieuw op"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Je patroon bevestigen"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Geef je pincode opnieuw op"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a61f5bb..db07609 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -98,8 +98,8 @@
<string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ਹੋਰਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
<string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ਕੇਵਲ ਪੇਅਰ ਕੀਤੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
<string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ਦ੍ਰਿਸ਼ਟਤਾ ਦਾ ਸਮਾਂ ਸਮਾਪਤ"</string>
- <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ਲੌਕ ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
- <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਲੌਕ ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
+ <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">" ਲਾਕ ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
+ <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਲਾਕ ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
<string name="bluetooth_devices" msgid="1886018064039454227">"ਬਲੂਟੁੱਥ ਡਿਵਾਈਸਾਂ"</string>
<string name="bluetooth_device_name" msgid="8415828355207423800">"ਡੀਵਾਈਸ ਦਾ ਨਾਮ"</string>
<string name="bluetooth_device_details" msgid="4594773497930028085">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ"</string>
@@ -330,15 +330,15 @@
<string name="lock_after_timeout_summary" msgid="6128431871360905631">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
<string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"ਸਲੀਪ ਦੇ ਤੁਰੰਤ ਬਾਅਦ, ਇਸਦੇ ਸਿਵਾਏ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਨਾ ਰੱਖਿਆ ਗਿਆ ਹੋਵੇ"</string>
<string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
- <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
- <string name="owner_info_settings_title" msgid="5530285568897386122">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
+ <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">" ਲਾਕ ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+ <string name="owner_info_settings_title" msgid="5530285568897386122">" ਲਾਕ ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ਕੋਈ ਨਹੀਂ"</string>
<string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ਉਦਾਹਰਨ ਵਜੋਂ, ਜੋਏ ਦਾ Android."</string>
<string name="user_info_settings_title" msgid="1195015434996724736">"ਉਪਭੋਗਤਾ ਜਾਣਕਾਰੀ"</string>
- <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+ <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">" ਲਾਕ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
<string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
@@ -347,19 +347,19 @@
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
<string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
<string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
- <string name="lockscreen_settings_title" msgid="3922976395527087455">"ਲੌਕ ਸਕ੍ਰੀਨ ਤਰਜੀਹਾਂ"</string>
+ <string name="lockscreen_settings_title" msgid="3922976395527087455">" ਲਾਕ ਸਕ੍ਰੀਨ ਤਰਜੀਹਾਂ"</string>
<string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਸਿਮ ਕਾਰਡ ਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
<string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਅਵਸਥਾ"</string>
- <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲੌਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
- <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+ <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲਾਕ , ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+ <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
<string name="fingerprint_add_title" msgid="1926752654454033904">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
- <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+ <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
<plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤੇ ਗਏ</item>
@@ -376,7 +376,7 @@
<string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ਅੱਗੇ"</string>
<string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਛੱਡਣਾ ਹੈ?"</string>
<string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਨਾ ਵਿੱਚ ਸਿਰਫ਼ ਇੱਕ ਜਾਂ ਦੋ ਮਿੰਟ ਲੱਗਦੇ ਹਨ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
- <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ਕੀ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
+ <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ਕੀ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ ਹੈ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
@@ -400,7 +400,7 @@
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦੀ ਵਰਤੋਂ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
- <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
+ <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="2989019978041986175">"ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਪਹਿਲੀ ਉਂਗਲ ਵਰਤੋ।"</string>
@@ -453,29 +453,29 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
<string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
<string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
- <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
- <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲੌਕ ਚੁਣੋ"</string>
+ <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲਾਕ ਚੁਣੋ"</string>
+ <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲਾਕ ਚੁਣੋ"</string>
<string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਟੈਬਲੈੱਟ ਦੀ ਸੁਰੱਖਿਆ ਕਰੋ"</string>
<string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
<string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
- <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ।"</string>
+ <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ।"</string>
<string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
<string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
<string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
- <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਧੀ ਚੁਣੋ"</string>
- <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ"</string>
- <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ"</string>
- <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+ <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਧੀ ਚੁਣੋ"</string>
+ <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
+ <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
+ <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
<string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ਸਲੀਪ ਤੋਂ ਤੁਰੰਤ ਬਾਅਦ"</string>
<string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"ਸਲੀਪ ਮੋਡ ਤੋਂ ਬਾਅਦ <xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
- <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲੌਕ"</string>
- <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ਲੌਕ ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
+ <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ"</string>
+ <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">" ਲਾਕ ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
- <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ ਲੌਕ ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
+ <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਕ ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
<string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ਕੋਈ ਨਹੀਂ"</string>
<string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
<string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"ਸਵਾਈਪ ਕਰੋ"</string>
@@ -487,7 +487,7 @@
<string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ਪਾਸਵਰਡ"</string>
<string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ਉੱਚ ਸੁਰੱਖਿਆ"</string>
<string name="unlock_set_do_later_title" msgid="4894767558414979243">"ਅਜੇ ਨਹੀਂ"</string>
- <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+ <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲਾਕ"</string>
<string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪੈਟਰਨ"</string>
<string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਿੰਨ"</string>
<string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਾਸਵਰਡ"</string>
@@ -500,7 +500,7 @@
<string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ਪਿੰਨ"</string>
<string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ਪਾਸਵਰਡ"</string>
<string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ > ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਸੈੱਟ ਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
- <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ ਲੌਕ ਬੰਦ ਕਰੋ"</string>
+ <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ ਲਾਕ ਬੰਦ ਕਰੋ"</string>
<string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"ਕੀ ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
<string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਹਟਾਉਣੀ ਹੈ?"</string>
<string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
@@ -531,7 +531,7 @@
<string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਂਗੇ।"</string>
- <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+ <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
<string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਂਗੇ।"</string>
@@ -604,7 +604,7 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ</item>
</plurals>
<string name="manage_trust_agents" msgid="4629279457536987768">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ"</string>
- <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
<string name="manage_trust_agents_summary" msgid="1475819820389620546">"ਕੋਈ ਨਹੀਂ"</string>
<plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਭਰੋਸੇਯੋਗ ਏਜੰਟ</item>
@@ -967,7 +967,7 @@
<string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਆਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
<string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ਡਾਇਲ ਪੈਡ ਟਚ ਟੋਨਾਂ"</string>
<string name="sound_effects_enable_title" msgid="4429690369187229592">"ਧੁਨੀਆਂ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
- <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ ਲੌਕ ਅਵਾਜ਼"</string>
+ <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ ਲਾਕ ਅਵਾਜ਼"</string>
<string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
<string name="audio_record_proc_title" msgid="4271091199976457534">"ਸ਼ੋਰ ਰੱਦ ਕਰਨਾ"</string>
<string name="volume_media_description" msgid="7949355934788807863">"ਸੰਗੀਤ, ਵੀਡੀਓ, ਗੇਮਸ, & ਹੋਰ ਮੀਡੀਆ"</string>
@@ -1083,18 +1083,18 @@
<string name="title_font_size" msgid="4405544325522105222">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
<string name="sim_lock_settings" msgid="3392331196873564292">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਸੈਟਿੰਗਾਂ"</string>
- <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ ਲੌਕ"</string>
+ <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ ਲਾਕ"</string>
<string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"ਬੰਦ"</string>
- <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"ਲੌਕ ਕੀਤਾ ਗਿਆ"</string>
- <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ ਲੌਕ"</string>
- <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
+ <string name="sim_lock_settings_summary_on" msgid="39103355956342985">" ਲਾਕ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ ਲਾਕ"</string>
+ <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ ਲਾਕ ਕਰੋ"</string>
<string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੈੱਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
<string name="sim_lock_on" product="default" msgid="2503536505568814324">"ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
<string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੈੱਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
<string name="sim_lock_off" product="default" msgid="258981978215428916">"ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
<string name="sim_pin_change" msgid="6311414184279932368">"ਸਿਮ ਪਿੰਨ ਬਦਲੋ"</string>
<string name="sim_enter_pin" msgid="6608715137008508432">"ਸਿਮ ਪਿੰਨ"</string>
- <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
+ <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ ਲਾਕ ਕਰੋ"</string>
<string name="sim_disable_sim_lock" msgid="7664729528754784824">"ਸਿਮ ਕਾਰਡ ਅਣਲਾਕ ਕਰੋ"</string>
<string name="sim_enter_old" msgid="6074196344494634348">"ਪੁਰਾਣਾ ਸਿਮ ਪਿੰਨ"</string>
<string name="sim_enter_new" msgid="8742727032729243562">"ਨਵਾਂ ਸਿਮ ਪਿੰਨ"</string>
@@ -1469,14 +1469,13 @@
<string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
<string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
- <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ਕੋਈ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ"</string>
+ <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ਕੋਈ ਸਕ੍ਰੀਨ ਲਾਕ ਸਥਾਪਤ ਕਰੋ"</string>
<string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸਥਾਪਤ ਕਰੋ"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ਆਪਣਾ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
@@ -1527,7 +1526,7 @@
<string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
<string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ਪ੍ਰੋਫਾਈਲ ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
- <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ ਲੌਕ ਹੁੰਦਾ ਹੈ"</string>
+ <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ ਲਾਕ ਹੁੰਦਾ ਹੈ"</string>
<string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ਅਣਲਾਕ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
@@ -1535,14 +1534,14 @@
<string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"ਬਹੁਤ ਸਾਰੀਆਂ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। <xliff:g id="NUMBER">%d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
<string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
<string name="lock_settings_profile_title" msgid="2121876391814535295">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ"</string>
- <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
- <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
+ <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲਾਕ"</string>
+ <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ ਲਾਕ ਵਰਤੋ"</string>
<string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਈ ਇੱਕ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
- <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ ਲੌਕ ਵਰਤਣਾ ਹੈ?"</string>
+ <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ ਲਾਕ ਵਰਤਣਾ ਹੈ?"</string>
<string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਕਾਰਜ ਨੀਤੀਆਂ ਦੋਵਾਂ ਲਾਕਾਂ \'ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"</string>
<string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਤੁਹਾਡੀ ਸੰਸਥਾ ਦੀਆਂ ਸੁਰੱਖਿਆ ਲੋੜਾਂ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇੱਕੋ ਲਾਕ ਦੀ ਵਰਤੋਂ ਆਪਣੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਅਤੇ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਕੋਈ ਵੀ ਕਾਰਜ ਲਾਕ ਨੀਤੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
- <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
- <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
+ <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ ਲਾਕ ਵਰਤੋ"</string>
+ <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ ਲਾਕ ਵਰਤੋ"</string>
<string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਾਕ ਵਰਗਾ"</string>
<string name="manageapplications_settings_title" msgid="7041951105633616745">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
@@ -1839,7 +1838,7 @@
<string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ <xliff:g id="SERVICE">%1$s</xliff:g> \'ਤੇ ਸੈੱਟ ਹੈ। ਵੱਡਦਰਸ਼ੀਕਰਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ, ਫਿਰ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਚੁਣੋ।"</string>
<string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ਵੌਲਿਊਮ ਕੁੰਜੀ ਸ਼ਾਰਟਕੱਟ"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ਸ਼ਾਰਟਕੱਟ ਸੇਵਾ"</string>
- <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+ <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">" ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
<string name="accessibility_shortcut_description" msgid="1765853731190717372">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਅਵਾਜ਼ ਕੁੰਜੀਆਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</string>
<string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ਉੱਚ ਵਖਰੇਵਾਂ ਲਿਖਤ"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਸਵੈ-ਅੱਪਡੇਟ ਕਰੋ"</string>
@@ -2573,8 +2572,8 @@
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਵਰਤੋਂਕਾਰ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="user_summary_restricted_profile" msgid="6354966213806839107">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
- <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
- <string name="user_set_lock_button" msgid="8311219392856626841">"ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="user_set_lock_button" msgid="8311219392856626841">" ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
<string name="user_summary_not_set_up" msgid="8778205026866794909">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤਾ"</string>
<string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤੀ - ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
<string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤਾ - ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
@@ -3112,8 +3111,8 @@
<string name="notifications_disabled" msgid="334416731283131597">"ਸਭ ਕੁਝ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਸ਼੍ਰੇਣੀਆਂ ਬੰਦ ਹਨ"</string>
<string name="notifications_silenced" msgid="4728603513072110381">"ਚੁੱਪ ਕਰਵਾਈਆਂ ਗਈਆਂ"</string>
- <string name="notifications_redacted" msgid="4493588975742803160">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
- <string name="notifications_hidden" msgid="3619610536038757468">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਨਹੀਂ"</string>
+ <string name="notifications_redacted" msgid="4493588975742803160">" ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
+ <string name="notifications_hidden" msgid="3619610536038757468">" ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਨਹੀਂ"</string>
<string name="notifications_priority" msgid="1066342037602085552">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕੀਤਾ ਗਿਆ"</string>
<string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
<string name="notification_summary_level" msgid="2726571692704140826">"ਪੱਧਰ %d"</string>
@@ -3504,7 +3503,7 @@
<string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ਮਿਟਾਓ ਅਤੇ ਰੁਪਾਂਤਰਣ ਕਰੋ"</string>
<string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
- <string name="notification_suggestion_title" msgid="387052719462473500">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
+ <string name="notification_suggestion_title" msgid="387052719462473500">" ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਦਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"ਸਭ"</string>
<string name="page_tab_title_support" msgid="8483187649355540109">"ਸਹਾਇਤਾ ਅਤੇ ਨੁਕਤੇ"</string>
@@ -3609,7 +3608,7 @@
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਣਲਾਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
<string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ਪਹਿਲਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਜਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
- <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ-ਲੌਕ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
+ <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ- ਲਾਕ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> ਕੁੱਲ ਉਪਲਬਧ ਕਰਵਾਈ ਗਈ\n\nਪਿਛਲੀ ਵਾਰ <xliff:g id="DATE">%2$s</xliff:g> ਨੂੰ ਚਲਾਈ ਗਈ"</string>
<string name="web_action_enable_title" msgid="4051513950976670853">"ਤਤਕਾਲ ਐਪਾਂ"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"ਐਪਾਂ ਸਥਾਪਤ ਨਾ ਹੋਈਆਂ ਹੋਣ \'ਤੇ ਵੀ ਉਹਨਾਂ ਵਿਚਲੇ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c18b03e..84f4fd4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -295,7 +295,7 @@
<string name="calls_title" msgid="3544471959217176768">"Połączenia"</string>
<string name="sms_messages_title" msgid="1778636286080572535">"SMS-y"</string>
<string name="cellular_data_summary" msgid="4660351864416939504">"Zezwalaj na mobilną transmisję danych"</string>
- <string name="allow_data_usage_title" msgid="2238205944729213062">"Transmisja danych w roamingu"</string>
+ <string name="allow_data_usage_title" msgid="2238205944729213062">"Użycie danych w roamingu"</string>
<string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
<string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
<string name="roaming_disable" msgid="1295279574370898378">"Połącz z usługami transmisji danych w roamingu"</string>
@@ -771,7 +771,7 @@
<string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit użycia baterii dla Wi‑Fi"</string>
<string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Przełącz na mobilną transmisję danych, jeśli Wi-Fi utraci dostęp do internetu."</string>
<string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatycznie przełączaj na mobilną transmisję danych"</string>
- <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za transmisję danych."</string>
+ <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za użycie danych."</string>
<string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
<string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Ustawienia Wi‑Fi"</string>
<string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi włączy się automatycznie"</string>
@@ -858,7 +858,7 @@
<string name="no_internet_access_text" msgid="7133561752896706392">"Ta sieć nie ma dostępu do internetu. Nadal chcesz się z nią łączyć?"</string>
<string name="no_internet_access_remember" msgid="4697314331614625075">"Nie pytaj ponownie o tę sieć"</string>
<string name="lost_internet_access_title" msgid="6228530645663584505">"Sieć Wi-Fi nie jest połączona z internetem"</string>
- <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za transmisję danych."</string>
+ <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za użycie danych."</string>
<string name="lost_internet_access_switch" msgid="2262459569601190039">"Przełącz na sieć komórkową"</string>
<string name="lost_internet_access_cancel" msgid="338273139419871110">"Pozostań przy Wi-Fi"</string>
<string name="lost_internet_access_persist" msgid="7634876061262676255">"Nie pokazuj już nigdy"</string>
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Aby korzystać z odcisku palca, ustaw wzór"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ze względów bezpieczeństwa ustaw kod PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ze względów bezpieczeństwa ustaw wzór"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Podaj ponownie hasło"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Podaj ponownie kod PIN"</string>
@@ -2410,13 +2409,13 @@
<string name="select_all" msgid="1562774643280376715">"Wybierz wszystkie"</string>
<string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Zarządzaj abonamentami"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Przesył danych w aplikacji"</string>
+ <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Użycie danych w aplikacji"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Transmisja danych w aplikacjach"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACJE O APLIKACJI"</string>
<string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilna transmisja danych"</string>
<string name="data_usage_data_limit" msgid="1193930999713192703">"Ustaw limit transmisji danych"</string>
- <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl transmisji danych"</string>
+ <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl użycie danych"</string>
<string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Transmisja danych w aplikacjach"</string>
<string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming danych"</string>
<string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz dane w tle"</string>
@@ -2435,7 +2434,7 @@
<string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Autosynchronizacja: osobiste"</string>
<string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Autosynchronizacja: do pracy"</string>
<string name="data_usage_change_cycle" msgid="7776556448920114866">"Zmień cykl"</string>
- <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu transmisji danych – dzień miesiąca:"</string>
+ <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu użycia danych – dzień miesiąca:"</string>
<string name="data_usage_empty" msgid="8621855507876539282">"W tym okresie aplikacje nie pobierały danych."</string>
<string name="data_usage_label_foreground" msgid="4938034231928628164">"Pierwszy plan"</string>
<string name="data_usage_label_background" msgid="3225844085975764519">"Tło"</string>
@@ -2462,7 +2461,7 @@
<string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Włącz mobilną transmisję danych w tle"</string>
<string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
<string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
- <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
+ <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia użycia danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
<string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu mobilnej transmisji danych."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa właśnie konto Google."</string>
@@ -2472,9 +2471,9 @@
<string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
<string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data w każdym miesiącu:"</string>
<string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Zapisz"</string>
- <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
- <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
- <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
+ <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o użyciu danych"</string>
+ <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit użycia danych"</string>
+ <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie użycia danych"</string>
<string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTablet może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTelefon może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
<string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
@@ -2800,7 +2799,7 @@
</plurals>
<string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"sieć komórkowa"</string>
- <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"transmisja danych"</string>
+ <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"użycie danych"</string>
<string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
<string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
<string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, przesyłanie, komunikacja NFC"</string>
@@ -3499,8 +3498,8 @@
<string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
<string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
<string name="cellular_data_usage" msgid="2155683719898158203">"Mobilna transmisja danych"</string>
- <string name="wifi_data_usage" msgid="686754111095324306">"Transmisja danych przez Wi-Fi"</string>
- <string name="ethernet_data_usage" msgid="5108764537574354616">"Transmisja danych w sieci Ethernet"</string>
+ <string name="wifi_data_usage" msgid="686754111095324306">"Użycie danych przez Wi-Fi"</string>
+ <string name="ethernet_data_usage" msgid="5108764537574354616">"Użycie danych w sieci Ethernet"</string>
<string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
<string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
<string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> danych mobilnych"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index cec6da8..fb8b6a7 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 62b43d1..8a3c785 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -319,7 +319,7 @@
<string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
<string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
<string name="date_time_set_timezone_title" msgid="3047322337368233197">"Fuso horário"</string>
- <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
+ <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
<string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
<string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defina padrão para usar impressão digital"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de segurança, defina um PIN."</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defina PIN para usar impressão digital"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por motivos de segurança, defina um padrão."</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduzir a palavra-passe"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduzir o PIN"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cec6da8..fb8b6a7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e922432..a82165c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pentru a utiliza amprenta, setați modelul"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Din motive de securitate, setați un cod PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pentru a utiliza amprenta, setați codul PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Din motive de securitate, setați un model"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduceți parola"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmați modelul"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduceți codul PIN"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2db55ef..7cd142b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте графический ключ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Защитите устройство: задайте PIN-код"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте PIN-код"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Защитите устройство: создайте графический ключ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введите пароль ещё раз"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Введите PIN-код ещё раз"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3ce60ce..fc2ea6c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ආරක්ෂාව සඳහා, PIN එකක් සකසන්න"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ආරක්ෂාව සඳහා, රටාවක් සකසන්න"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ඔබගේ මුරපදය නැවතත් ඇතුළු කරන්න"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ඔබගේ රටාව තහවුරු කරන්න"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ඔබගේ PIN අංකය නැවත ඇතුළු කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1033758..11e99fc 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1285,7 +1285,7 @@
<string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
<string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_detail_dialog_other" msgid="8907101974576694793">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk chcete zobraziť viditeľný obsah tohto zariadenia typu <xliff:g id="NAME">^1</xliff:g>, klepnite na položku Preskúmať."</string>
- <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém zahrnuje súbory, ktoré sa používajú na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>"</string>
+ <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém obsahuje súbory, používané na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>."</string>
<string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> môže mať uložené fotky, hudbu, aplikácie a ďalšie dáta, ktoré využívajú <xliff:g id="SIZE">^2</xliff:g> úložiska. \n\nAk chcete zobraziť podrobnosti, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</string>
<string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
@@ -1363,7 +1363,7 @@
<string name="restore_default_apn_completed" msgid="2824775307377604897">"Predvolené nastavenia prístupových bodov boli obnovené"</string>
<string name="reset_dashboard_title" msgid="6254873816990678620">"Obnovenie možností"</string>
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Sieť, aplikácie a zariadenie sa dajú obnoviť"</string>
- <string name="reset_network_title" msgid="6166025966016873843">"Resetovať Wi‑Fi, mobilné pripojenie a Bluetooth"</string>
+ <string name="reset_network_title" msgid="6166025966016873843">"Resetovať Wi‑Fi, dáta a Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Touto akciou obnovíte nastavenia všetkých sietí vrátane\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej siete"</li>\n<li>"siete Bluetooth"</li></string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Chcete resetovať všetky nastavenia sietí? Túto akciu nie je možné vrátiť späť."</string>
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostných dôvodov si nastavte kód PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ak chcete použiť odtlačok prsta, nastavte PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostných dôvodov si nastavte vzor"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova zadajte heslo"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svoj vzor"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova zadajte kód PIN"</string>
@@ -1627,8 +1626,8 @@
<string name="show_running_services" msgid="5736278767975544570">"Spustené služby"</string>
<string name="show_background_processes" msgid="2009840211972293429">"Vyrovnávacia pamäť"</string>
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
- <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovenie predvolieb aplikácií"</string>
- <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete obnoviť predvoľby aplikácií?"</string>
+ <string name="reset_app_preferences" msgid="1321050641018356925">"Resetovať predvoľby aplikácií"</string>
+ <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete resetovať predvoľby aplikácií?"</string>
<string name="reset_app_preferences_desc" msgid="4822447731869201512">"Touto akciou obnovíte predvoľby položiek:\n\n "<li>"deaktivované aplikácie,"</li>\n" "<li>"deaktivované upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie pre rôzne akcie,"</li>\n" "<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Neprídete o žiadne dáta v aplikáciách."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
@@ -3126,7 +3125,7 @@
<string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
<string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
- <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
+ <string name="device_feedback" msgid="3238056036766293294">"Spätná väzba o zariadení"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadajte PIN správcu"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ce132cf..a295247 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nastavite vzorec za prstni odtis"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Zaradi varnosti nastavite kodo PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nastavite kodo PIN za prstni odtis"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Nastavite vzorec za večjo varnost"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova vnesite geslo"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova vnesite kodo PIN"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index ce0c313..9d31cc0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Për të përdorur gjurmën e gishtit, vendos motivin"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Për siguri, cakto një kod PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Për të përdorur gjurmën e gishtit, vendos kodin PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Për siguri, cakto një motiv"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Fut përsëri fjalëkalimin"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmo motivin"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Fut përsëri kodin PIN"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 65a8d21..7e3a43f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1488,8 +1488,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Подесите шаблон да бисте користили отисак"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Подесите PIN из безбедносних разлога"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Подесите PIN да бисте користили отисак"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Подесите шаблон из безбедносних разлога"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Поново унесите лозинку"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдите шаблон"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Поново унесите PIN"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a008b02..259caa3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Grafiskt lösenord krävs för fingeravtryck"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Av säkerhetsskäl måste du ange en pinkod"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pinkod krävs för fingeravtryck"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Av säkerhetsskäl måste du ange ett grafiskt lösenord"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ange ditt lösenord igen"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta grafiskt lösenord"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ange din pinkod igen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 36eb7cf..5e76399 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Weka mchoro ili utumie alama ya kidole"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kwa sababu za usalama, weka PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Weka PIN ili utumie alama ya kidole"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kwa sababu za usalama, weka mchoro"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Weka nenosiri lako tena"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Weka PIN yako tena"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index acbb215..056a0ee 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"வடிவத்தை அமைக்கவும்"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"பின்னை அமைக்கவும்"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"பாதுகாப்பிற்காக, பேட்டர்னை அமைக்கவும்"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"பின்னை மீண்டும் உள்ளிடவும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 24b8797..3461428 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"వేలిముద్ర బ్యాకప్ను సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"భద్రత కోసం, పిన్ను సెట్ చేయండి"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"వేలిముద్ర బ్యాకప్ను సెట్ చేయండి"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"భద్రత కోసం, నమూనాను సెట్ చేయండి"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"మీ పాస్వర్డ్ను మళ్ళీ నమోదు చేయండి"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"మీ నమూనాను నిర్ధారించండి"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"మీ పిన్ను మళ్లీ నమోదు చేయండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 329a2b6..f6041f5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่ารูปแบบ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ตั้ง PIN เพื่อความปลอดภัย"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ตั้งรูปแบบเพื่อความปลอดภัย"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ป้อนรหัสผ่านอีกครั้ง"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ยืนยันรูปแบบของคุณ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ป้อน PIN อีกครั้ง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c26ef32..02eb2a4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para magamit ang fingerprint, i-set ang pattern"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Para sa seguridad, magtakda ng PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para magamit ang fingerprint, i-set ang PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Para sa seguridad, magtakda ng pattern"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ilagay muli ang iyong password"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ilagay muli ang iyong PIN"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a74ee9e..beffa4a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Parmak izi için desen ayarlayın"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Güvenlik için PIN ayarlayın"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Parmak izi için PIN ayarlayın"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Güvenlik için desen oluşturun"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Şifrenizi yeniden girin"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'inizi yeniden girin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8450175..85cd393 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1501,8 +1501,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Щоб користуватися відбитком пальця, налаштуйте ключ"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"З міркувань безпеки налаштуйте PIN-код"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Щоб користуватися відбитком пальця, налаштуйте PIN-код"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"З міркувань безпеки налаштуйте ключ"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введіть пароль ще раз"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Підтвердьте ключ розблокування"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Введіть PIN-код ще раз"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 0288f11..90917fa 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"سیکیورٹی کیلئے PIN سیٹ کریں"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"سیکیورٹی کیلئے پیٹرن سیٹ کریں"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"اپنا پاس ورڈ دوبارہ درج کریں"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"اپنے پیٹرن کی توثیق کریں"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"اپنا PIN دوبارہ درج کریں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 4e9572c..33bbda0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun grafik kalit o‘rnating"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Xavfsizlik uchun PIN kod o‘rnating"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Xavfsizlik uchun grafik kalit o‘rnating"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolni qayta kiriting"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Grafik kalitni tasdiqlang"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN kodni qayta kiriting"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5a53bb9..2bada63 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Để bảo mật, hãy đặt mã PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Để dùng vân tay, đặt mã PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Vì lý do bảo mật, hãy thiết lập một hình mở khóa"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Nhập lại mật khẩu của bạn"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Nhập lại mã PIN của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f77847b..de80b5d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"要使用指纹，请设置解锁图案"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"为了安全起见，请设置 PIN 码"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"要使用指纹，请设置 PIN 码"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"为了安全起见，请设置图案"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"重新输入密码"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"确认您的图案"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"重新输入 PIN 码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 39c8e76..f7f540c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1476,8 +1476,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定上鎖圖案"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為安全起見，請設定 PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"為安全起見，請設定上鎖圖案"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入密碼"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖形"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"請重新輸入 PIN"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 52218e4..965e9b5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1475,8 +1475,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定解鎖圖案"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為了安全起見，請設定 PIN 碼"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN 碼"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"為了安全起見，請設定圖案"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入你的密碼"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖案"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"請重新輸入你的 PIN 碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 98c02e8..3bf7908 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1476,8 +1476,7 @@
<string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
<string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ngokuphepha, setha i-PIN"</string>
<string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ukuze usebenzise izigxivizo zeminwe, setha iphinikhodi"</string>
- <!-- no translation found for lockpassword_choose_your_pattern_message (5986983400689720015) -->
- <skip />
+ <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ngokuphepha, setha iphethini"</string>
<string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Faka kabusha iphasiwedi yakho"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Faka kabusha i-PIN yakho"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0e40fec..51da73d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3442,7 +3442,7 @@
<!-- Message on first screen of choose PIN flow [CHAR LIMIT=NONE] -->
<string name="lockpassword_choose_your_pin_message">For security, set a PIN</string>
<!-- Header on first screen of choose password/PIN as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->
- <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set PIN</string>
+ <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set a PIN</string>
<!-- Message on first screen of choose pattern flow [CHAR LIMIT=NONE] -->
<string name="lockpassword_choose_your_pattern_message">For security, set a pattern</string>
<!-- Header on password confirm screen [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index ddf68c1..ddf3bf5 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -92,7 +92,7 @@
mApplicationFeatureProvider = FeatureFactory.getFactory(activity)
.getApplicationFeatureProvider(activity);
mState = ApplicationsState.getInstance(activity.getApplication());
- mSession = mState.newSession(this);
+ mSession = mState.newSession(this, getLifecycle());
mDpm = new DevicePolicyManagerWrapper(
(DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
@@ -107,7 +107,6 @@
@Override
public void onResume() {
super.onResume();
- mSession.resume();
mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
@@ -118,16 +117,10 @@
}
}
- @Override
- public void onPause() {
- mSession.pause();
- super.onPause();
- }
@Override
public void onDestroy() {
stopListeningToPackageRemove();
- mSession.release();
super.onDestroy();
}
diff --git a/src/com/android/settings/applications/AppStateBaseBridge.java b/src/com/android/settings/applications/AppStateBaseBridge.java
index d0b8431..2329b44 100644
--- a/src/com/android/settings/applications/AppStateBaseBridge.java
+++ b/src/com/android/settings/applications/AppStateBaseBridge.java
@@ -50,15 +50,15 @@
public void resume() {
mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
- mAppSession.resume();
+ mAppSession.onResume();
}
public void pause() {
- mAppSession.pause();
+ mAppSession.onPause();
}
public void release() {
- mAppSession.release();
+ mAppSession.onDestroy();
}
public void forceUpdate(String pkg, int uid) {
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a9e3ae2..9edbd86 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -988,7 +988,7 @@
if (DEBUG) Log.i(TAG, "Resume! mResumed=" + mResumed);
if (!mResumed) {
mResumed = true;
- mSession.resume();
+ mSession.onResume();
mLastSortMode = sort;
if (mExtraInfoBridge != null) {
mExtraInfoBridge.resume();
@@ -1002,7 +1002,7 @@
public void pause() {
if (mResumed) {
mResumed = false;
- mSession.pause();
+ mSession.onPause();
if (mExtraInfoBridge != null) {
mExtraInfoBridge.pause();
}
@@ -1015,7 +1015,7 @@
}
public void release() {
- mSession.release();
+ mSession.onDestroy();
if (mExtraInfoBridge != null) {
mExtraInfoBridge.release();
}
diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
index 1d325ce..b9e251c 100644
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ b/src/com/android/settings/applications/ManageDomainUrls.java
@@ -66,7 +66,7 @@
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
mApplicationsState = ApplicationsState.getInstance(
(Application) getContext().getApplicationContext());
- mSession = mApplicationsState.newSession(this);
+ mSession = mApplicationsState.newSession(this, getLifecycle());
setHasOptionsMenu(true);
}
@@ -76,24 +76,6 @@
}
@Override
- public void onResume() {
- super.onResume();
- mSession.resume();
- }
-
- @Override
- public void onPause() {
- super.onPause();
- mSession.pause();
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- mSession.release();
- }
-
- @Override
public void onRunningStateChanged(boolean running) {
}
diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
index d220a46..70bc17c 100644
--- a/src/com/android/settings/applications/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -32,7 +32,6 @@
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge.Callback;
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.notification.EmptyTextSettings;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState;
@@ -53,7 +52,7 @@
super.onCreate(icicle);
mApplicationsState = ApplicationsState.getInstance((Application)
getContext().getApplicationContext());
- mSession = mApplicationsState.newSession(this);
+ mSession = mApplicationsState.newSession(this, getLifecycle());
mSmsBackend = new AppStateSmsPremBridge(getContext(), mApplicationsState, this);
}
@@ -66,21 +65,18 @@
@Override
public void onResume() {
super.onResume();
- mSession.resume();
mSmsBackend.resume();
}
@Override
public void onPause() {
mSmsBackend.pause();
- mSession.pause();
super.onPause();
}
@Override
public void onDestroy() {
mSmsBackend.release();
- mSession.release();
super.onDestroy();
}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 5df66f1..600b23b 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -47,6 +47,8 @@
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.dashboard.conditional.ConditionAdapter;
import com.android.settings.dashboard.suggestions.SuggestionAdapter;
+import com.android.settings.dashboard.suggestions.SuggestionController;
+import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionLogHelper;
@@ -76,6 +78,7 @@
private final IconCache mCache;
private final Context mContext;
+ private final SuggestionControllerMixin mSuggestionControllerMixin;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final DashboardFeatureProvider mDashboardFeatureProvider;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
@@ -100,6 +103,7 @@
public DashboardAdapter(Context context, Bundle savedInstanceState,
List<Condition> conditions, SuggestionParser suggestionParser,
+ SuggestionControllerMixin suggestionControllerMixin,
SuggestionDismissController.Callback callback) {
// @deprecated In favor of suggestionsV2 below.
@@ -110,6 +114,7 @@
mContext = context;
final FeatureFactory factory = FeatureFactory.getFactory(context);
+ mSuggestionControllerMixin = suggestionControllerMixin;
mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
@@ -488,7 +493,7 @@
mDashboardData.getItemEntityByPosition(position),
null, mSuggestionsShownLogged);
mSuggestionDismissHandler = new SuggestionDismissController(mContext,
- holder.data, mSuggestionParser, mCallback);
+ holder.data, mSuggestionControllerMixin, mSuggestionParser, mCallback);
holder.data.setAdapter(mSuggestionAdapter);
} else if (suggestionsV2 != null && suggestionsV2.size() > 0) {
conditionOnly = false;
@@ -496,7 +501,7 @@
(List<Suggestion>) mDashboardData.getItemEntityByPosition(position),
mSuggestionsShownLogged);
mSuggestionDismissHandler = new SuggestionDismissController(mContext,
- holder.data, null /* parser */, mCallback);
+ holder.data, mSuggestionControllerMixin, null /* parser */, mCallback);
holder.data.setAdapter(mSuggestionAdapter);
}
}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 769a3d7..c0ace7d 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -91,6 +91,7 @@
mSuggestionFeatureProvider = FeatureFactory.getFactory(context)
.getSuggestionFeatureProvider(context);
if (mSuggestionFeatureProvider.isSuggestionV2Enabled(context)) {
+ Log.d(TAG, "Suggestion v2 is enabled, creating SuggestionControllerMixin");
mSuggestionControllerMixin = new SuggestionControllerMixin(context, this /* host */,
getLifecycle());
}
@@ -207,7 +208,8 @@
mDashboard.setHasFixedSize(true);
mDashboard.setListener(this);
mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
- mSuggestionParser, this /* SuggestionDismissController.Callback */);
+ mSuggestionParser, mSuggestionControllerMixin,
+ this /* SuggestionDismissController.Callback */);
mDashboard.setAdapter(mAdapter);
mDashboard.setItemAnimator(new DashboardItemAnimator());
mSummaryLoader.setSummaryConsumer(mAdapter);
@@ -224,7 +226,7 @@
@VisibleForTesting
void rebuildUI() {
if (!mSuggestionFeatureProvider.isSuggestionEnabled(getContext())) {
- Log.d(TAG, "Suggestion feature is disabled, skipping suggestion entirely");
+ Log.d(TAG, "Suggestion v1 feature is disabled, skipping suggestion v1");
updateCategory();
} else {
new SuggestionLoader().execute();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionController.java b/src/com/android/settings/dashboard/suggestions/SuggestionController.java
index ac20433..865e045 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionController.java
@@ -110,6 +110,18 @@
}
}
+ public void dismissSuggestions(Suggestion suggestion) {
+ if (!isReady()) {
+ Log.w(TAG, "SuggestionController not ready, cannot dismiss " + suggestion.getId());
+ return;
+ }
+ try {
+ mRemoteService.dismissSuggestion(suggestion);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Error when calling dismissSuggestion()", e);
+ }
+ }
+
/**
* Whether or not the manager is ready
*/
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java b/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
index 44744ec..cf015ac 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
@@ -111,4 +111,8 @@
public void onLoaderReset(Loader<List<Suggestion>> loader) {
}
+
+ public void dismissSuggestion(Suggestion suggestion) {
+ mSuggestionController.dismissSuggestions(suggestion);
+ }
}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 6affa8c..b3636c1 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -57,6 +57,7 @@
private final Context mContext;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
+ private final SuggestionControllerMixin mSuggestionMixin;
/**
* @deprecated in favor of the new Suggestion backend.
@@ -66,8 +67,9 @@
private final Callback mCallback;
public SuggestionDismissController(Context context, RecyclerView recyclerView,
- SuggestionParser parser, Callback callback) {
+ SuggestionControllerMixin suggestionMixin, SuggestionParser parser, Callback callback) {
super(0, ItemTouchHelper.START | ItemTouchHelper.END);
+ mSuggestionMixin = suggestionMixin;
mContext = context;
mSuggestionParser = parser;
mSuggestionFeatureProvider = FeatureFactory.getFactory(context)
@@ -102,7 +104,7 @@
final int position = viewHolder.getAdapterPosition();
final Suggestion suggestionV2 = mCallback.getSuggestionAt(position);
if (suggestionV2 != null) {
- mSuggestionFeatureProvider.dismissSuggestion(mContext, suggestionV2);
+ mSuggestionFeatureProvider.dismissSuggestion(mContext, mSuggestionMixin, suggestionV2);
mCallback.onSuggestionDismissed(suggestionV2);
} else {
final Tile suggestion = mCallback.getSuggestionForPosition(position);
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 1465408..8670823 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -79,7 +79,8 @@
/**
* Dismisses a suggestion.
*
- * @deprecated in favor of {@link #dismissSuggestion(Context, Suggestion)}
+ * @deprecated in favor of {@link #dismissSuggestion(Context, SuggestionControllerMixin,
+ * Suggestion)}
*/
@Deprecated
void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion);
@@ -87,7 +88,8 @@
/**
* Dismisses a suggestion.
*/
- void dismissSuggestion(Context context, Suggestion suggestion);
+ void dismissSuggestion(Context context, SuggestionControllerMixin suggestionMixin,
+ Suggestion suggestion);
/**
* Returns an identifier for the suggestion
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 715964b..d4002b2 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -173,14 +173,15 @@
}
@Override
- public void dismissSuggestion(Context context, Suggestion suggestion) {
- if (suggestion == null || context == null) {
+ public void dismissSuggestion(Context context, SuggestionControllerMixin mixin,
+ Suggestion suggestion) {
+ if (mixin == null || suggestion == null || context == null) {
return;
}
mMetricsFeatureProvider.action(
context, MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
suggestion.getId());
- // TODO: Call SettingsIntelligence to dismiss suggestion.
+ mixin.dismissSuggestion(suggestion);
}
@Override
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index b424fa2..c623395 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -61,7 +61,7 @@
(Application) getContext().getApplicationContext());
mDataSaverBackend = new DataSaverBackend(getContext());
mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
- mSession = mApplicationsState.newSession(this);
+ mSession = mApplicationsState.newSession(this, getLifecycle());
}
@Override
@@ -78,7 +78,6 @@
mDataSaverBackend.refreshWhitelist();
mDataSaverBackend.refreshBlacklist();
mDataSaverBackend.addListener(this);
- mSession.resume();
mDataUsageBridge.resume();
}
@@ -87,7 +86,6 @@
super.onPause();
mDataSaverBackend.remListener(this);
mDataUsageBridge.pause();
- mSession.pause();
}
@Override
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index 58a34b9..c60b841 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -64,7 +64,7 @@
(Application) getContext().getApplicationContext());
mDataSaverBackend = new DataSaverBackend(getContext());
mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
- mSession = mApplicationsState.newSession(this);
+ mSession = mApplicationsState.newSession(this, getLifecycle());
mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM);
mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
@@ -109,7 +109,6 @@
@Override
public void onResume() {
super.onResume();
- mSession.resume();
mDataUsageBridge.resume();
}
@@ -117,13 +116,11 @@
public void onPause() {
super.onPause();
mDataUsageBridge.pause();
- mSession.pause();
}
@Override
public void onDestroy() {
super.onDestroy();
- mSession.release();
mDataUsageBridge.release();
}
diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
index 54d1fa3..667ae31 100644
--- a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
+++ b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
@@ -21,4 +21,6 @@
*/
public interface DevelopmentOptionsActivityRequestCodes {
int REQUEST_CODE_ENABLE_OEM_UNLOCK = 0;
+
+ int REQUEST_CODE_DEBUG_APP = 1;
}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 4a47c68..51fb436 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -122,15 +122,19 @@
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ boolean handledResult = false;
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof DeveloperOptionsPreferenceController) {
- if (((DeveloperOptionsPreferenceController) controller).onActivityResult(
- requestCode, resultCode, data)) {
- return;
- }
+ // We do not break early because it is possible for multiple controllers to
+ // handle the same result code.
+ handledResult |=
+ ((DeveloperOptionsPreferenceController) controller).onActivityResult(
+ requestCode, resultCode, data);
}
}
- super.onActivityResult(requestCode, resultCode, data);
+ if (!handledResult) {
+ super.onActivityResult(requestCode, resultCode, data);
+ }
}
@Override
@@ -193,8 +197,8 @@
// bug report shortcut
// select mock location app
controllers.add(new DebugViewAttributesPreferenceController(context));
- // select debug app
- // wait for debugger
+ controllers.add(new SelectDebugAppPreferenceController(context, fragment));
+ controllers.add(new WaitForDebuggerPreferenceController(context));
// verify apps over usb
// logger buffer sizes
// store logger data persistently on device
@@ -203,11 +207,11 @@
controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));
// feature flags
controllers.add(new WifiDisplayCertificationPreferenceController(context));
- // enable wi-fi verbose logging
+ controllers.add(new WifiVerboseLoggingPreferenceController(context));
controllers.add(new WifiAggressiveHandoverPreferenceController(context));
controllers.add(new WifiRoamScansPreferenceController(context));
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
- // tethering hardware acceleration
+ controllers.add(new TetheringHardwareAccelPreferenceController(context));
// select usb configuration
controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
// disable absolute volume
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
new file mode 100644
index 0000000..c1f04f2
--- /dev/null
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+ .REQUEST_CODE_DEBUG_APP;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController {
+
+ private static final String DEBUG_APP_KEY = "debug_app";
+
+ private final DevelopmentSettingsDashboardFragment mFragment;
+ private final PackageManagerWrapper mPackageManager;
+
+ private Preference mPreference;
+
+ public SelectDebugAppPreferenceController(Context context,
+ DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+ mFragment = fragment;
+ mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return DEBUG_APP_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (DEBUG_APP_KEY.equals(preference.getKey())) {
+ final Intent intent = getActivityStartIntent();
+ intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true /* value */);
+ mFragment.startActivityForResult(intent, REQUEST_CODE_DEBUG_APP);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ updatePreferenceSummary();
+ }
+
+ @Override
+ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) {
+ return false;
+ }
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ data.getAction());
+ updatePreferenceSummary();
+ return true;
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ mPreference.setEnabled(false);
+ mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
+ }
+
+ @VisibleForTesting
+ Intent getActivityStartIntent() {
+ return new Intent(mContext, AppPicker.class);
+ }
+
+ private void updatePreferenceSummary() {
+ final String debugApp = Settings.Global.getString(
+ mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+ if (debugApp != null && debugApp.length() > 0) {
+ mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_set,
+ getAppLabel(debugApp)));
+ } else {
+ mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
+ }
+ }
+
+ private String getAppLabel(String debugApp) {
+ try {
+ final ApplicationInfo ai = mPackageManager.getApplicationInfo(debugApp,
+ PackageManager.GET_DISABLED_COMPONENTS);
+ final CharSequence lab = mPackageManager.getApplicationLabel(ai);
+ return lab != null ? lab.toString() : debugApp;
+ } catch (PackageManager.NameNotFoundException e) {
+ return debugApp;
+ }
+ }
+}
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
new file mode 100644
index 0000000..f638f31
--- /dev/null
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class TetheringHardwareAccelPreferenceController extends
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+ private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
+
+ // We use the "disabled status" in code, but show the opposite text
+ // on screen. So a value 0 indicates the tethering hardware accel is enabled.
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 0;
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 1;
+
+ private SwitchPreference mPreference;
+
+ public TetheringHardwareAccelPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return TETHERING_HARDWARE_OFFLOAD;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean isEnabled = (Boolean) newValue;
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final int tetheringMode = Settings.Global.getInt(
+ mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED, 0 /* default */);
+ mPreference.setChecked(tetheringMode != SETTING_VALUE_OFF);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED, SETTING_VALUE_OFF);
+ mPreference.setEnabled(false);
+ mPreference.setChecked(false);
+ }
+}
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
new file mode 100644
index 0000000..5e7dfa2
--- /dev/null
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+ .REQUEST_CODE_DEBUG_APP;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+public class WaitForDebuggerPreferenceController extends
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+ private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
+
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 1;
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 0;
+
+ private SwitchPreference mPreference;
+
+ public WaitForDebuggerPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return WAIT_FOR_DEBUGGER_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean debuggerEnabled = (Boolean) newValue;
+ final String debugApp = Settings.Global.getString(
+ mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+ writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final String debugApp = Settings.Global.getString(
+ mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+ final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
+ writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+ mPreference.setChecked(debuggerEnabled);
+ mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+ }
+
+ @Override
+ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) {
+ return false;
+ }
+ final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
+ final String debugApp = data.getAction();
+ writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+ mPreference.setChecked(debuggerEnabled);
+ mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+ return true;
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ writeDebuggerAppOptions(null /* package name */,
+ false /* waitForDebugger */, false /* persistent */);
+ mPreference.setChecked(false);
+ mPreference.setEnabled(false);
+ }
+
+ @VisibleForTesting
+ IActivityManager getActivityManagerService() {
+ return ActivityManager.getService();
+ }
+
+ private void writeDebuggerAppOptions(String packageName, boolean waitForDebugger,
+ boolean persistent) {
+ try {
+ getActivityManagerService().setDebugApp(packageName, waitForDebugger, persistent);
+ } catch (RemoteException ex) {
+ /* intentional no-op */
+ }
+ }
+}
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
new file mode 100644
index 0000000..4904996
--- /dev/null
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+public class WifiVerboseLoggingPreferenceController extends
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
+
+ private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
+
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 1;
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 0;
+
+ private final WifiManager mWifiManager;
+ private SwitchPreference mPreference;
+
+ public WifiVerboseLoggingPreferenceController(Context context) {
+ super(context);
+
+ mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return WIFI_VERBOSE_LOGGING_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean isEnabled = (Boolean) newValue;
+ mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
+ mPreference.setChecked(enabled);
+
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);
+ mPreference.setEnabled(false);
+ mPreference.setChecked(false);
+ }
+}
diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
new file mode 100644
index 0000000..b419b72
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
+import android.os.CancellationSignal;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+
+/**
+ * Sidecar fragment to handle the state around fingerprint authentication
+ */
+public class FingerprintAuthenticateSidecar extends InstrumentedPreferenceFragment {
+
+ private static final String TAG = "FingerprintAuthenticateSidecar";
+
+ private FingerprintManager mFingerprintManager;
+ private Listener mListener;
+ private AuthenticationResult mAuthenticationResult;
+ private CancellationSignal mCancellationSignal;
+ private AuthenticationError mAuthenticationError;
+
+ public interface Listener {
+ void onAuthenticationSucceeded(AuthenticationResult result);
+ void onAuthenticationFailed();
+ void onAuthenticationError(int errMsgId, CharSequence errString);
+ void onAuthenticationHelp(int helpMsgId, CharSequence helpString);
+ }
+
+ private class AuthenticationError {
+ int error;
+ CharSequence errorString;
+
+ public AuthenticationError(int errMsgId, CharSequence errString) {
+ error = errMsgId;
+ errorString = errString;
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.FINGERPRINT_AUTHENTICATE_SIDECAR;
+ }
+
+ private FingerprintManager.AuthenticationCallback mAuthenticationCallback =
+ new FingerprintManager.AuthenticationCallback() {
+ @Override
+ public void onAuthenticationSucceeded(AuthenticationResult result) {
+ mCancellationSignal = null;
+ if (mListener != null) {
+ mListener.onAuthenticationSucceeded(result);
+ } else {
+ mAuthenticationResult = result;
+ mAuthenticationError = null;
+ }
+ }
+
+ @Override
+ public void onAuthenticationFailed() {
+ if (mListener != null) {
+ mListener.onAuthenticationFailed();
+ }
+ }
+
+ @Override
+ public void onAuthenticationError(int errMsgId, CharSequence errString) {
+ mCancellationSignal = null;
+ if (mListener != null) {
+ mListener.onAuthenticationError(errMsgId, errString);
+ } else {
+ mAuthenticationError = new AuthenticationError(errMsgId, errString);
+ mAuthenticationResult = null;
+ }
+ }
+
+ @Override
+ public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+ if (mListener != null) {
+ mListener.onAuthenticationHelp(helpMsgId, helpString);
+ }
+ }
+ };
+
+ public void setFingerprintManager(FingerprintManager fingerprintManager) {
+ mFingerprintManager = fingerprintManager;
+ }
+
+ public void startAuthentication(int userId) {
+ mCancellationSignal = new CancellationSignal();
+ mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,
+ mAuthenticationCallback, null, userId);
+ }
+
+ public void stopAuthentication() {
+ if (mCancellationSignal != null && !mCancellationSignal.isCanceled()) {
+ mCancellationSignal.cancel();
+ }
+ mCancellationSignal = null;
+ }
+
+ public void setListener(Listener listener) {
+ if (mListener == null && listener != null) {
+ if (mAuthenticationResult != null) {
+ mListener.onAuthenticationSucceeded(mAuthenticationResult);
+ mAuthenticationResult = null;
+ }
+ if (mAuthenticationError != null &&
+ mAuthenticationError.error != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+ mListener.onAuthenticationError(mAuthenticationError.error,
+ mAuthenticationError.errorString);
+ mAuthenticationError = null;
+ }
+ }
+ mListener = listener;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 6a8a1fd..fb09f7a 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -29,8 +29,6 @@
import android.graphics.drawable.Drawable;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
-import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
@@ -152,41 +150,44 @@
protected static final boolean DEBUG = true;
private FingerprintManager mFingerprintManager;
- private CancellationSignal mFingerprintCancel;
private boolean mInFingerprintLockout;
private byte[] mToken;
private boolean mLaunchedConfirm;
private Drawable mHighlightDrawable;
private int mUserId;
+ private static final String TAG_AUTHENTICATE_SIDECAR = "authenticate_sidecar";
private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
+ private FingerprintAuthenticateSidecar mAuthenticateSidecar;
private FingerprintRemoveSidecar mRemovalSidecar;
private HashMap<Integer, String> mFingerprintsRenaming;
- private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
- @Override
- public void onAuthenticationSucceeded(AuthenticationResult result) {
- int fingerId = result.getFingerprint().getFingerId();
- mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
- }
+ FingerprintAuthenticateSidecar.Listener mAuthenticateListener =
+ new FingerprintAuthenticateSidecar.Listener() {
+ @Override
+ public void onAuthenticationSucceeded(
+ FingerprintManager.AuthenticationResult result) {
+ int fingerId = result.getFingerprint().getFingerId();
+ mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
+ }
- @Override
- public void onAuthenticationFailed() {
- mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
- }
+ @Override
+ public void onAuthenticationFailed() {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
+ }
- @Override
- public void onAuthenticationError(int errMsgId, CharSequence errString) {
- mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
- .sendToTarget();
- }
+ @Override
+ public void onAuthenticationError(int errMsgId, CharSequence errString) {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
+ .sendToTarget();
+ }
- @Override
- public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
- mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
- .sendToTarget();
- }
- };
+ @Override
+ public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
+ .sendToTarget();
+ }
+ };
FingerprintRemoveSidecar.Listener mRemovalListener =
new FingerprintRemoveSidecar.Listener() {
@@ -223,7 +224,6 @@
retryFingerprint();
break;
case MSG_FINGER_AUTH_SUCCESS:
- mFingerprintCancel = null;
highlightFingerprintItem(msg.arg1);
retryFingerprint();
break;
@@ -241,18 +241,10 @@
}
};
- private void stopFingerprint() {
- if (mFingerprintCancel != null && !mFingerprintCancel.isCanceled()) {
- mFingerprintCancel.cancel();
- }
- mFingerprintCancel = null;
- }
-
/**
* @param errMsgId
*/
protected void handleError(int errMsgId, CharSequence msg) {
- mFingerprintCancel = null;
switch (errMsgId) {
case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
return; // Only happens if we get preempted by another activity. Ignored.
@@ -290,9 +282,8 @@
return;
}
if (!mInFingerprintLockout) {
- mFingerprintCancel = new CancellationSignal();
- mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,
- mAuthCallback, null, mUserId);
+ mAuthenticateSidecar.startAuthentication(mUserId);
+ mAuthenticateSidecar.setListener(mAuthenticateListener);
}
}
@@ -308,6 +299,15 @@
Activity activity = getActivity();
mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
+ mAuthenticateSidecar = (FingerprintAuthenticateSidecar)
+ getFragmentManager().findFragmentByTag(TAG_AUTHENTICATE_SIDECAR);
+ if (mAuthenticateSidecar == null) {
+ mAuthenticateSidecar = new FingerprintAuthenticateSidecar();
+ getFragmentManager().beginTransaction()
+ .add(mAuthenticateSidecar, TAG_AUTHENTICATE_SIDECAR).commit();
+ }
+ mAuthenticateSidecar.setFingerprintManager(mFingerprintManager);
+
mRemovalSidecar = (FingerprintRemoveSidecar)
getFragmentManager().findFragmentByTag(TAG_REMOVAL_SIDECAR);
if (mRemovalSidecar == null) {
@@ -454,10 +454,13 @@
@Override
public void onPause() {
super.onPause();
- stopFingerprint();
if (mRemovalSidecar != null) {
mRemovalSidecar.setListener(null);
}
+ if (mAuthenticateSidecar != null) {
+ mAuthenticateSidecar.setListener(null);
+ mAuthenticateSidecar.stopAuthentication();
+ }
}
@Override
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 20acee9..c034746 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -28,7 +28,6 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.net.Uri;
import android.os.AsyncTask;
@@ -77,7 +76,7 @@
*/
//TODO(b/35810915): Make InstalledAppDetails use this controller
public class AppButtonsPreferenceController extends AbstractPreferenceController implements
- PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, OnDestroy,
+ PreferenceControllerMixin, LifecycleObserver, OnResume, OnDestroy,
ApplicationsState.Callbacks {
public static final String APP_CHG = "chg";
@@ -144,7 +143,7 @@
if (packageName != null) {
mAppEntry = mState.getEntry(packageName, mUserId);
- mSession = mState.newSession(this);
+ mSession = mState.newSession(this, lifecycle);
lifecycle.addObserver(this);
} else {
mFinishing = true;
@@ -179,7 +178,6 @@
@Override
public void onResume() {
- mSession.resume();
if (isAvailable() && !mFinishing) {
mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(mActivity,
UserManager.DISALLOW_APPS_CONTROL, mUserId);
@@ -193,14 +191,8 @@
}
@Override
- public void onPause() {
- mSession.pause();
- }
-
- @Override
public void onDestroy() {
stopListeningToPackageRemove();
- mSession.release();
}
private class UninstallAndDisableButtonListener implements View.OnClickListener {
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index e288225..1588d5d 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -15,7 +15,7 @@
-->
<resources>
- <bool name="config_show_camera_hal_hdrplus">true</bool>
+ <bool name="config_show_camera_hal_hdrplus">false</bool>
<bool name="config_enableColorTemperature">false</bool>
<bool name="config_show_camera_laser_sensor">false</bool>
</resources>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index b14a80f..595a9c6 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -120,7 +120,7 @@
mConditionList = new ArrayList<>();
mConditionList.add(mCondition);
when(mCondition.shouldShow()).thenReturn(true);
- mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null);
+ mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null, null);
mSuggestionHeaderData = new DashboardData.SuggestionConditionHeaderData(mConditionList, 1);
when(mView.getTag()).thenReturn(mCondition);
}
@@ -419,7 +419,7 @@
@Test
public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
final DashboardAdapter adapter =
- spy(new DashboardAdapter(mContext, null, null, null, null));
+ spy(new DashboardAdapter(mContext, null, null, null, null, null));
final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
@@ -457,7 +457,8 @@
final List<Tile> suggestions =
makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
- null /* conditions */, null /* suggestionParser */, null /* callback */));
+ null /* conditions */, null /* suggestionParser */,
+ null /* suggestionControllerMixin */, null /* callback */));
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
adapter.onBindConditionAndSuggestion(
holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
@@ -474,7 +475,7 @@
@Test
public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
DashboardAdapter adapter =
- spy(new DashboardAdapter(mContext, null, null, null, null));
+ spy(new DashboardAdapter(mContext, null, null, null, null, null));
final List<Tile> suggestions = makeSuggestions("pkg1");
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
final DashboardData dashboardData = adapter.mDashboardData;
@@ -534,7 +535,7 @@
@Test
public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
- mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
+ mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
final List<Tile> suggestions = makeSuggestions("pkg1");
final DashboardCategory category = mock(DashboardCategory.class);
final List<Tile> tiles = new ArrayList<>();
@@ -561,7 +562,7 @@
@Test
public void testBindConditionAndSuggestion_v2_shouldSetSuggestionAdapterAndNoCrash() {
- mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
+ mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
final DashboardCategory category = mock(DashboardCategory.class);
final List<Tile> tiles = new ArrayList<>();
@@ -592,7 +593,8 @@
savedInstance.putInt(DashboardAdapter.STATE_SUGGESTION_CONDITION_MODE,
DashboardData.HEADER_MODE_FULLY_EXPANDED);
mDashboardAdapter = new DashboardAdapter(mContext, savedInstance, mConditionList,
- null /* SuggestionParser */, null /* SuggestionDismissController.Callback */);
+ null /* SuggestionParser */, null /* suggestionControllerMixin */,
+ null /* SuggestionDismissController.Callback */);
final List<Tile> suggestions = new ArrayList<>();
final DashboardCategory category = mock(DashboardCategory.class);
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
index ca9faf5..93bc549 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
@@ -55,6 +56,8 @@
@Mock
private SuggestionParser mSuggestionParser;
@Mock
+ private SuggestionControllerMixin mSuggestionControllerMixin;
+ @Mock
private SuggestionDismissController.Callback mCallback;
private FakeFeatureFactory mFactory;
@@ -69,7 +72,7 @@
when(mRecyclerView.getResources().getDimension(anyInt())).thenReturn(50F);
mController = new SuggestionDismissController(mContext, mRecyclerView,
- mSuggestionParser, mCallback);
+ mSuggestionControllerMixin, mSuggestionParser, mCallback);
}
@Test
@@ -114,4 +117,17 @@
eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
}
+
+ @Test
+ public void onSwiped_v2_shouldTriggerDismissSuggestion() {
+ final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
+ when(mCallback.getSuggestionAt(anyInt())).thenReturn(
+ new Suggestion.Builder("id").build());
+
+ mController.onSwiped(vh, ItemTouchHelper.START);
+
+ verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
+ eq(mContext), eq(mSuggestionControllerMixin), nullable(Suggestion.class));
+ verify(mCallback).onSuggestionDismissed(nullable(Suggestion.class));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index 5982210..deb860d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -35,11 +35,12 @@
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import android.provider.Settings.Secure;
+import android.service.settings.suggestions.Suggestion;
import android.util.FeatureFlagUtils;
import android.util.Pair;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
@@ -95,6 +96,8 @@
@Mock
private SuggestionParser mSuggestionParser;
@Mock
+ private SuggestionControllerMixin mSuggestionControllerMixin;
+ @Mock
private Tile mSuggestion;
@Mock
private ActivityManager mActivityManager;
@@ -325,7 +328,7 @@
@Test
public void dismissSuggestion_noParserOrSuggestion_noop() {
- mProvider.dismissSuggestion(mContext, null, null);
+ mProvider.dismissSuggestion(mContext, null, (Tile) null);
mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
mProvider.dismissSuggestion(mContext, null, mSuggestion);
@@ -333,6 +336,16 @@
}
@Test
+ public void dismissSuggestion_noControllerOrSuggestion_noop() {
+ mProvider.dismissSuggestion(mContext, null, (Suggestion) null);
+ mProvider.dismissSuggestion(mContext, mSuggestionControllerMixin, null);
+ mProvider.dismissSuggestion(mContext, null, new Suggestion.Builder("id").build());
+
+ verifyZeroInteractions(mFactory.metricsFeatureProvider);
+ verifyZeroInteractions(mSuggestionControllerMixin);
+ }
+
+ @Test
public void getSuggestionIdentifier_samePackage_returnClassName() {
final Tile suggestion = new Tile();
suggestion.intent = new Intent()
diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java
index d7b44e8..d4e7e20 100644
--- a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java
@@ -21,29 +21,28 @@
.CameraHalHdrPlusPreferenceControllerV2.USERDEBUG_BUILD;
import static com.android.settings.development.CameraHalHdrPlusPreferenceControllerV2.USER_BUILD;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
@@ -75,7 +74,10 @@
@Test
@Config(qualifiers = "mcc999")
- public void isAvailable_withConfigNoShow_shouldReturnFalse() {
+ public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() {
+ SettingsShadowSystemProperties.set(
+ CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
+
assertThat(mController.isAvailable()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
new file mode 100644
index 0000000..03f4972
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+ .REQUEST_CODE_DEBUG_APP;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SelectDebugAppPreferenceControllerTest {
+
+ @Mock
+ private Preference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Mock
+ private DevelopmentSettingsDashboardFragment mFragment;
+ @Mock
+ private PackageManagerWrapper mPackageManagerWrapper;
+
+ private Context mContext;
+ private SelectDebugAppPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = spy(new SelectDebugAppPreferenceController(mContext, mFragment));
+ ReflectionHelpers.setField(mController, "mPackageManager" /* field name */,
+ mPackageManagerWrapper);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_preferenceClicked_launchActivity() {
+ final Intent activityStartIntent = new Intent(mContext, AppPicker.class);
+ final String preferenceKey = mController.getPreferenceKey();
+ doReturn(activityStartIntent).when(mController).getActivityStartIntent();
+ when(mPreference.getKey()).thenReturn(preferenceKey);
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mFragment).startActivityForResult(activityStartIntent, REQUEST_CODE_DEBUG_APP);
+ }
+
+ @Test
+ public void updateState_foobarAppSelected_shouldUpdateSummaryWithDebugAppLabel() {
+ final String debugApp = "foobar";
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setSummary(
+ mContext.getResources().getString(R.string.debug_app_set, debugApp));
+ }
+
+ @Test
+ public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() {
+ final String debugApp = null;
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setSummary(
+ mContext.getResources().getString(R.string.debug_app_not_set));
+ }
+
+ @Test
+ public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithDebugLabel() {
+ Intent activityResultIntent = new Intent(mContext, AppPicker.class);
+ final String appLabel = "foobar";
+ activityResultIntent.setAction(appLabel);
+ final boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP,
+ Activity.RESULT_OK, activityResultIntent);
+
+ assertThat(result).isTrue();
+ verify(mPreference).setSummary(
+ mContext.getResources().getString(R.string.debug_app_set, appLabel));
+ }
+
+ @Test
+ public void onActivityResult_badRequestCode_shouldReturnFalse() {
+ assertThat(mController.onActivityResult(
+ -1 /* requestCode */, -1 /* resultCode */, null /* intent */)).isFalse();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mPreference).setEnabled(false);
+ verify(mPreference).setSummary(
+ mContext.getResources().getString(R.string.debug_app_not_set));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
new file mode 100644
index 0000000..e044f2a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class TetheringHardwareAccelPreferenceControllerTest {
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private TetheringHardwareAccelPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new TetheringHardwareAccelPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingEnabled_turnOnTetheringAccel() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingDisabled_turnOffTetheringAccel() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED,
+ TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED,
+ TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+ final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+ verify(mPreference).setEnabled(false);
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
new file mode 100644
index 0000000..e1d96d1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+ .REQUEST_CODE_DEBUG_APP;
+import static com.android.settings.development.WaitForDebuggerPreferenceController
+ .SETTING_VALUE_OFF;
+import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WaitForDebuggerPreferenceControllerTest {
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Mock
+ private IActivityManager mIActivityManager;
+
+ private Context mContext;
+ private WaitForDebuggerPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = spy(new WaitForDebuggerPreferenceController(mContext));
+ doReturn(mIActivityManager).when(mController).getActivityManagerService();
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChange_settingEnabledFoobarApp_waitForDebuggerShouldBeOn()
+ throws RemoteException {
+ final String debugApp = "foobar";
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ mController.onPreferenceChange(mPreference, true /* newValue */);
+
+
+ verify(mIActivityManager).setDebugApp(debugApp,
+ true /* waitForDebugger */, true /* persistent */);
+ }
+
+ @Test
+ public void onPreferenceChange_settingDisabledFoobarApp_waitForDebuggerShouldBeOff()
+ throws RemoteException {
+ final String debugApp = "foobar";
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ mController.onPreferenceChange(mPreference, false /* newValue */);
+
+ verify(mIActivityManager).setDebugApp(debugApp,
+ false /* waitForDebugger */, true /* persistent */);
+ }
+
+ @Test
+ public void updateState_settingEnabledNullDebugApp_preferenceShouldBeCheckedAndDisabled() {
+ final String debugApp = null;
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void updateState_settingEnabledFoobarApp_preferenceShouldBeCheckedAndDisabled() {
+ final String debugApp = "foobar";
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void updateState_settingDisabledNullDebugApp_preferenceShouldNotBeCheckedAndDisabled() {
+ final String debugApp = null;
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void updateState_settingDisableFoobarApp_preferenceShouldNotBeCheckedAndEnabled() {
+ final String debugApp = "foobar";
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+ debugApp);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void onActivityResult_requestCodeAndSettingEnabled_waitForDebuggerShouldBeChecked() {
+ Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_ON);
+ boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
+ onActivityResultIntent);
+
+ assertThat(result).isTrue();
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void onActivityResult_requestCodeAndSettingDisabled_waitForDebuggerShouldNotBeChecked() {
+ Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+ SETTING_VALUE_OFF);
+ boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
+ onActivityResultIntent);
+
+ assertThat(result).isTrue();
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onActivityResult_badRequestCode_shouldReturnFalse() {
+ boolean result = mController.onActivityResult(
+ -1 /* request code */, -1 /* result code */, null /* intent */);
+
+ assertThat(result).isFalse();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mIActivityManager).setDebugApp(null /* package name */,
+ false /* waitForDebugger */, false /* persistent */);
+ verify(mPreference).setChecked(false);
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
new file mode 100644
index 0000000..f8a9b87
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiVerboseLoggingPreferenceControllerTest {
+ @Mock
+ private Context mContext;
+ @Mock
+ private WifiManager mWifiManager;
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private WifiVerboseLoggingPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+ mController = new WifiVerboseLoggingPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChange_settingEnabled_shouldEnableVerboseLogging() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ verify(mWifiManager).enableVerboseLogging(
+ WifiVerboseLoggingPreferenceController.SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChange_settingDisabled_shouldDisablVerboseLogging() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ verify(mWifiManager).enableVerboseLogging(
+ WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingEnabled_shouldEnablePreference() {
+ when(mWifiManager.getVerboseLoggingLevel()).thenReturn(1);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_settingDisabled_shouldDisablePreference() {
+ when(mWifiManager.getVerboseLoggingLevel()).thenReturn(0);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mWifiManager).enableVerboseLogging(
+ WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+ verify(mPreference).setEnabled(false);
+ verify(mPreference).setChecked(false);
+ }
+}