Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e80793b..0879c12 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -4121,7 +4121,7 @@
<string name="switch_on_text" msgid="5664542327776075105">"مفعّل"</string>
<string name="switch_off_text" msgid="1315547447393646667">"غير مفعّل"</string>
<string name="screen_pinning_title" msgid="6927227272780208966">"تثبيت الشاشة على تطبيق معيّن"</string>
- <string name="screen_pinning_description" msgid="6927147836599784578">"تسمح لك ميزة \"تثبيت الشاشة على تطبيق معيّن\" بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيته. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة. \n\nعندما يتم تثبيت الشاشة على تطبيق معيّن، يمكن للتطبيق المثبت فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nلاستخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\"، عليك تنفيذ ما يلي: \n1- تفعيل ميزة \"تثبيت الشاشة على تطبيق معيّن\" \n2- فتح \"نظرة عامة\" \n3- النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
+ <string name="screen_pinning_description" msgid="6927147836599784578">"تسمح لك ميزة \"تثبيت الشاشة على تطبيق معيّن\" بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيته. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة. \n\nعندما يتم تثبيت الشاشة على تطبيق معيّن، يمكن للتطبيق المثبت فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nلاستخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\"، عليك تنفيذ ما يلي: \n١- تفعيل ميزة \"تثبيت الشاشة على تطبيق معيّن\" \n٢- فتح \"نظرة عامة\" \n٣- النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
<string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"تسمح لك ميزة تثبيت التطبيق بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيته. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة. \n\nعندما يتم تثبيت تطبيق، يمكن للتطبيق المثبت فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nإذا أردت مشاركة جهازك بأمان مع أحد الأشخاص، اجعله يستخدم حساب ضيف بدلاً من استخدام حسابك. \n\nلاستخدام ميزة تثبيت التطبيقات، يجب تنفيذ ما يلي: \n1- تفعيل ميزة تثبيت التطبيقات \n2- فتح \"نظرة عامة\" \n3- النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
<string name="screen_pinning_dialog_message" msgid="8144925258679476654">"عندما يتم تثبيت الشاشة على تطبيق معيّن: \n\n• يمكن الوصول إلى البيانات الشخصية \n (مثلاً جهات الاتصال ومحتوى الرسائل الإلكترونية) \n• يمكن للتطبيق المثبت فتح التطبيقات الأخرى \n\nلا تستخدِم ميزة \"تثبيت الشاشة على تطبيق معيّن\" إلا مع المستخدمين الموثوق فيهم."</string>
<string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"طلب إدخال النقش الخاص بإلغاء القفل قبل إزالة التثبيت"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b12f0b4..bb7f6b4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"ব্যক্তিগত প্ৰ’ফাইলৰ একাউণ্টসমূহ"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"কৰ্মস্থানৰ একাউণ্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"ব্যক্তিগত একাউণ্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"অনুসন্ধান"</string>
+ <string name="search_settings" msgid="7573686516434589771">"Search"</string>
<string name="display_settings" msgid="7197750639709493852">"ডিছপ্লে’"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"স্বয়ং-ঘূৰ্ণন স্ক্ৰীণ"</string>
<string name="color_mode_title" msgid="8666690832113906028">"ৰংবোৰ"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"মসৃণ ডিছপ্লে’"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছুমান সমলৰ বাবে ৰিফ্ৰেশ্বৰ হাৰ স্বয়ংক্ৰিয়ভাৱে ৬০ৰ পৰা ৯০হাৰ্টজলৈ বঢ়ায়। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"৯০হাৰ্টজ ৰিফ্ৰেশ্বৰ হাৰ বলপূৰ্বকভাৱে প্ৰয়োগ কৰক"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"স্পৰ্শৰ উন্নত সংবেদনশীলতা আৰু এনিমেশ্বনৰ গুণগত মানৰ বাবে সৰ্বোচ্চ ৰিফ্ৰেশ্বৰ হাৰ। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্ৰীণৰ সতর্কতা"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"অন / আপুনি যদি চাই থাকে তেন্তে স্ক্ৰীণখন কেতিয়াও বন্ধ নহয়"</string>
@@ -2349,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"অফ হৈ আছে"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"সেৱা যোগ কৰক"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"প্ৰিণ্টাৰ যোগ কৰক"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"সন্ধান কৰক"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"Search"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"সংযোগ কৰিবলৈ প্ৰিণ্টাৰ বিচাৰি থকা হৈছে"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"সেৱা নিষ্ক্ৰিয়হৈ আছে"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"প্ৰিণ্টিঙৰ কামবোৰ"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3036888..f55f996 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"স্মুথ ডিসপ্লে"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছু কন্টেন্টের রিফ্রেশ রেট অটোমেটিক ৬০ থেকে ৯০ Hz পর্যন্ত বেড়ে যায়। ব্যাটারির ব্যবহার বেড়ে যায়।"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ফোর্স 90 Hz রিফ্রেশ রেট"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"সর্বাধিক রিফ্রেশ রেট সেট করে টাচ রেসপন্সিভনেস এবং অ্যানিমেশন কোয়ালিটি উন্নত করুন। ব্যাটারির খরচ বেড়ে যায়।"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্রিন অ্যাটেনশন"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"চালু আছে / আপনি এটির দিকে তাকিয়ে থাকলে স্ক্রিন বন্ধ হবে না"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a22c864..00a7c04 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1631,7 +1631,7 @@
<string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM kartice"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ove"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
@@ -3182,11 +3182,11 @@
<string name="sim_cards_changed_message" msgid="7726897488921853655">"SIM kartice su promijenjene"</string>
<string name="sim_cards_changed_message_summary" msgid="7338082681445213621">"Dodirnite za podešavanje aktivnosti"</string>
<string name="sim_cellular_data_unavailable" msgid="4653591727755387534">"Prijenos podataka na mobilnoj mreži je nedostupan"</string>
- <string name="sim_cellular_data_unavailable_summary" msgid="6505871722911347881">"Dodirnite za odabir SIM kartice za prijenos podataka"</string>
+ <string name="sim_cellular_data_unavailable_summary" msgid="6505871722911347881">"Dodirnite za odabir SIM-a za prijenos podataka"</string>
<string name="sim_calls_always_use" msgid="967857230039768111">"Uvijek koristi ovo za pozive"</string>
<string name="select_sim_for_data" msgid="1577092784244587369">"Odaberite SIM za podatke"</string>
<string name="select_sim_for_sms" msgid="5335510076282673497">"Odaberite SIM za SMS"</string>
- <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM kartica za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
+ <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
<string name="select_sim_for_calls" msgid="7843107015635189868">"Poziv putem"</string>
<string name="sim_select_card" msgid="1226182454109919045">"Odaberite SIM karticu"</string>
<string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 676e8d2..cd9ff0d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1191,8 +1191,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Setzt die Aktualisierungsrate für einige Inhalte automatisch von 60 auf 90 Hz herauf. Erhöhter Akkuverbrauch."</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Aktualisierungsrate von 90 Hz erzwingen"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Höchste Aktualisierungsrate für bessere Touchscreen-Reaktion und flüssigere Animationen. Erhöhter Akkuverbrauch."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"Aufmerksamkeitserkennung"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"An / Der Bildschirm wird nicht ausgeschaltet, solange du auf ihn blickst"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f48f4fc..9867805 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Affichage fluide"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmente automatiquement la fréquence d\'actualisation de 60 à 90 Hz pour certains contenus. Accroît l\'utilisation de la batterie."</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forcer la fréquence d\'actualisation à 90 Hz"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Fréquence d\'actualisation la plus élevée pour améliorer la réactivité au toucher et la qualité d\'animation. Accroît l\'utilisation de la batterie."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"Regard sur écran"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé - L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index fab9ba3..2bf05f8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"વ્યક્તિગત પ્રોફાઇલ એકાઉન્ટ્સ"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"કાર્ય એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"વ્યક્તિગત એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"શોધો"</string>
+ <string name="search_settings" msgid="7573686516434589771">"શોધ"</string>
<string name="display_settings" msgid="7197750639709493852">"ડિસ્પ્લે"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"ઑટો રોટેટ સ્ક્રીન"</string>
<string name="color_mode_title" msgid="8666690832113906028">"રંગો"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"અમુક કન્ટેન્ટ માટે રિફ્રેશ થવાનો રેટ ઑટોમૅટિક રીતે 60થી વધારીને 90 Hz કરે છે. બૅટરીનો વપરાશ વધારે છે."</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz રિફ્રેશ રેટ ફરજિયાત બનાવો"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"સ્પર્શના પ્રતિભાવમાં સુધારણા અને ઍનિમેશનની ક્વૉલિટી માટે ઉચ્ચતમ રિફ્રેશ રેટ. આ સુવિધા બૅટરીનો વપરાશ વધારે છે."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"સ્ક્રીન અટેન્શન"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ચાલુ / જો તમે સ્ક્રીન તરફ જોતા હો, તો તમારી સ્ક્રીન બંધ થશે નહીં"</string>
@@ -2349,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"બંધ"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"સેવા ઉમેરો"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"પ્રિન્ટર ઉમેરો"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"શોધો"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"શોધ"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"પ્રિન્ટર્સ માટે શોધી રહ્યું છે"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"સેવા અક્ષમ કરેલ છે"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"પ્રિન્ટ જોબ્સ"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5b786d9..256640d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3622,7 +3622,7 @@
<string name="picture_in_picture_empty_text" msgid="9123600661268731579">"ピクチャー イン ピクチャーに対応したアプリはインストールされていません"</string>
<string name="picture_in_picture_keywords" msgid="3605379820551656253">"pip ピクチャー イン"</string>
<string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"ピクチャー イン ピクチャー"</string>
- <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"PIP を許可"</string>
+ <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"ピクチャー イン ピクチャーを許可"</string>
<string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"このアプリを開いているとき、またはアプリを離れた後に、動画の再生を続けるなどの目的でピクチャー イン ピクチャー ウィンドウを表示できるようにします。このウィンドウは、使用中の他のアプリの上に重ねて表示されます。"</string>
<string name="interact_across_profiles_title" msgid="7285906999927669971">"シングル プロファイル モード"</string>
<string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"接続済み"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 7007d6a..49540ff 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"ಕೆಲಸದ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"ವೈಯಕ್ತಿಕ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"ಹುಡುಕಿ"</string>
+ <string name="search_settings" msgid="7573686516434589771">"Search"</string>
<string name="display_settings" msgid="7197750639709493852">"ಪ್ರದರ್ಶನ"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
<string name="color_mode_title" msgid="8666690832113906028">"ಬಣ್ಣಗಳು"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"ನಯವಾದ ಡಿಸ್ಪ್ಲೇ"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ಕೆಲವು ವಿಷಯಗಳಿಗೆ ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ 60 ರಿಂದ 90 ಕ್ಕೆ ಏರಿಸುತ್ತದೆ. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಅನ್ವಯಿಸಿ"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ಸುಧಾರಿತ ಸ್ಪರ್ಶ ಪ್ರತಿಕ್ರಿಯೆ ಮತ್ತು ಆ್ಯನಿಮೇಶನ್ ಗುಣಮಟ್ಟಗಳಿಗಾಗಿ ಅತ್ಯಧಿಕ ರಿಫ್ರೆಶ್ ರೇಟ್. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಿಕೆ"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ನೀವು ಸ್ಕ್ರೀನ್ನ ಕಡೆಗೆ ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ, ಆನ್ / ಸ್ಕ್ರೀನ್ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
@@ -2349,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"ಆಫ್"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"ಸೇವೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"ಪ್ರಿಂಟರ್ ಸೇರಿಸಿ"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"ಹುಡುಕಿ"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"Search"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"ಪ್ರಿಂಟರ್ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"ಸೇವೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"ಮುದ್ರಣ ಕಾರ್ಯಗಳು"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index c71122a..a664717 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"വ്യക്തിഗത പ്രൊഫൈൽ അക്കൗണ്ടുകൾ"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"ഔദ്യോഗിക അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"വ്യക്തിഗത അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"തിരയൽ"</string>
+ <string name="search_settings" msgid="7573686516434589771">"Search"</string>
<string name="display_settings" msgid="7197750639709493852">"ഡിസ്പ്ലേ"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"സ്ക്രീൻ സ്വയമേവ തിരിക്കുക"</string>
<string name="color_mode_title" msgid="8666690832113906028">"നിറങ്ങൾ"</string>
@@ -2348,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"ഓഫ്"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"സേവനം ചേർക്കുക"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"പ്രിന്റർ ചേർക്കുക"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"തിരയൽ"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"Search"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"പ്രിന്ററുകൾക്കായി തിരയുന്നു"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"സേവനം പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"പ്രിന്റ് ജോലികൾ"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9710ede..344ec00 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"वैयक्तिक प्रोफाईल खाती"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"कार्य खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"वैयक्तिक खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"शोध"</string>
+ <string name="search_settings" msgid="7573686516434589771">"Search"</string>
<string name="display_settings" msgid="7197750639709493852">"डिस्प्ले"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"ऑटो-रोटेट स्क्रीन"</string>
<string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"काही आशयासाठी रिफ्रेश रेट ६० ते ९० Hz पर्यंत आपोआप वाढवते. बॅटरी वापर वाढवते."</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"फोर्स ९० Hz रिफ्रेश रेट"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"सुधारित स्पर्श प्रतिसाद आणि अॅनिमेशन गुणवत्तेसाठी उच्चतम रिफ्रेश रेट. बॅटरी वापर वाढवतो."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रीन अटेंशन"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
@@ -2350,7 +2349,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"बंद"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"सेवा जोडा"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"प्रिंटर जोडा"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"शोध"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"Search"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"प्रिंटर शोधत आहे"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"सेवा अक्षम केली"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"प्रिंट कार्ये"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 178f942..9ef5bf9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2749,7 +2749,7 @@
<string name="work_mode_label" msgid="1001415270126064436">"Jobbprofil"</string>
<string name="work_mode_on_summary" msgid="2042885311126239961">"Administreres av organisasjonen din"</string>
<string name="work_mode_off_summary" msgid="4044568753909036134">"Apper og varsler er slått av"</string>
- <string name="remove_managed_profile_label" msgid="1294933737673830431">"Fjern arbeidsprofilen"</string>
+ <string name="remove_managed_profile_label" msgid="1294933737673830431">"Fjern jobbprofilen"</string>
<string name="background_data" msgid="321903213000101158">"Bakgrunnsdata"</string>
<string name="background_data_summary" msgid="6572245922513522466">"Apper kan når som helst synkronisere, sende og motta data"</string>
<string name="background_data_dialog_title" msgid="1692005302993229867">"Vil du deaktivere bakgrunnsdata?"</string>
@@ -3020,7 +3020,7 @@
<string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vil du slette deg selv?"</string>
<string name="user_confirm_remove_title" msgid="3626559103278006002">"Vil du slette brukeren?"</string>
<string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Fjerne denne profilen?"</string>
- <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Vil du fjerne arbeidsprofilen?"</string>
+ <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Fjern jobbprofilen?"</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"Lagringsplassen og dataene dine blir fjernet fra dette nettbrettet. Denne handlingen kan ikke angres."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"Lagringsplassen og dataene dine blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
<string name="user_confirm_remove_message" msgid="362545924965977597">"Alle apper og data slettes."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index bfd9195..ec7a792 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -444,7 +444,7 @@
<string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"अर्को थप्नुहोस्"</string>
<string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"अर्को"</string>
<string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"तपाईँले आफ्नो फोन खोल्नका अतिरिक्त खरिद र एप पहुँच प्राधिकरण गर्नाका लागि पनि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
- <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" स्क्रिन लकको विकल्प असक्षम पारिएको छ। थप जान्नलाई आफ्नो सङ्गठनको प्रशासकलाई सम्पर्क गर्नुहोस्। "<annotation id="admin_details">"थप विवरणहरू"</annotation>\n\n"तपाईं खरिदहरूलाई अधिकार दिन र अनुप्रयोगमाथि पहुँच पाउनका लागि आफ्नो फिंगरप्रिन्ट समेत प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+ <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" स्क्रिन लकको विकल्प असक्षम पारिएको छ। थप जान्नलाई आफ्नो सङ्गठनको प्रशासकलाई सम्पर्क गर्नुहोस्। "<annotation id="admin_details">"थप विवरणहरू"</annotation>\n\n"तपाईं खरिदहरूलाई अधिकार दिन र एपमाथि पहुँच पाउनका लागि आफ्नो फिंगरप्रिन्ट समेत प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
<string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"औँला उठाई, फेरि सेंसर छुनुहोस्"</string>
<string name="fingerprint_add_max" msgid="8639321019299347447">"तपाईं <xliff:g id="COUNT">%d</xliff:g> सम्म फिंगरप्रिन्टहरू थप्न सक्नुहुन्छ"</string>
<string name="fingerprint_intro_error_max" msgid="4431784409732135610">"तपाईंले अधिकतम संख्यामा फिंगरप्रिन्टहरू थप्नुभएको छ"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"केही सामग्रीका लागि रिफ्रेस रेट स्वतः ६० हर्ट्जबाट बढाएर ९० हर्ट्ज बनाउँछ। ब्याट्रीको उपयोग बढाउँछ।"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"रिफ्रेस गर्ने दर बलपूर्वक ९० हर्ज बनाउनुहोस्"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"स्क्रिनमा छुँदा स्क्रिनले जनाउने प्रतिक्रिया र एनिमेसनको गुणस्तर सुधार्न उच्चतम रिफ्रेस रेट। ब्याट्रीको खपत बढाउँछ।"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधा"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सक्रिय / तपाईं स्क्रिनमा हेर्दै हुनुहुन्छ भने यो बन्द हुने छैन"</string>
@@ -2315,7 +2314,7 @@
<string name="enable_service_pin_reason" msgid="6040417014360237703">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो PIN पुष्टि गर्न आवश्यक छ।"</string>
<string name="enable_service_password_reason" msgid="6962544350351734238">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेबा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो पासवर्ड पुष्टि गर्न आवश्यक छ।"</string>
<string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ले यो यन्त्र पूर्ण रूपमा नियन्त्रण गर्ने अनुमति माग्दै छ। यो सेवाले स्क्रिनमा भएका जानकारी पढ्न तथा पहुँचसम्बन्धी आवश्यकता भएका प्रयोगकर्ताहरूका तर्फबाट कारबाही गर्न सक्छ। धेरैजसो अनुप्रयोगहरूका हकमा यो स्तरको नियन्त्रण उपयुक्त हुँदैन।"</string>
- <string name="accessibility_service_warning_description" msgid="6573203795976134751">"तपाईंलाई पहुँच राख्न आवश्यक पर्ने कुरामा सहयोग गर्ने अनुप्रयोगहरूमाथि पूर्ण नियन्त्रण गर्नु उपयुक्त हुन्छ तर अधिकांश अनुप्रयोगहरूका हकमा यस्तो नियन्त्रण उपयुक्त हुँदैन।"</string>
+ <string name="accessibility_service_warning_description" msgid="6573203795976134751">"तपाईंलाई पहुँच राख्न आवश्यक पर्ने कुरामा सहयोग गर्ने एपमाथि पूर्ण नियन्त्रण गर्नु उपयुक्त हुन्छ तर अधिकांश अनुप्रयोगहरूका हकमा यस्तो नियन्त्रण उपयुक्त हुँदैन।"</string>
<string name="accessibility_service_screen_control_title" msgid="324795030658109870">"स्क्रिन हेर्नुहोस् र नियन्त्रण गर्नुहोस्"</string>
<string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"यसले स्क्रिनमा देखिने सबै सामग्री पढ्न सक्छ र अन्य एपहरूमा उक्त सामग्री देखाउन सक्छ।"</string>
<string name="accessibility_service_action_perform_title" msgid="1449360056585337833">"कारबाहीहरू हेर्नुहोस् र तिनमा कार्य गर्नुहोस्"</string>
@@ -2428,11 +2427,11 @@
<string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"तपाईंको यन्त्र सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
<string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"यसले उच्च क्षमतायुक्त पृष्ठभूमिको गतिविधि समावेश गर्दछ"</string>
<plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
- <item quantity="other">%1$d अनुप्रयोगहरूमाथि बन्देज लगाउनुहोस्</item>
+ <item quantity="other">%1$d एपमाथि बन्देज लगाउनुहोस्</item>
<item quantity="one">%1$d माथि बन्देज लगाउनुहोस्</item>
</plurals>
<plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
- <item quantity="other">%1$d अनुप्रयोगहरूमाथि हालसालै बन्देज लगाइयो</item>
+ <item quantity="other">%1$d एपमाथि हालसालै बन्देज लगाइयो</item>
<item quantity="one">%1$s माथि हालसालै बन्देज लगाइयो</item>
</plurals>
<plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
@@ -2444,8 +2443,8 @@
<item quantity="one">यो एप पृष्ठभूमिमा चल्न सक्दैन</item>
</plurals>
<plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
- <item quantity="other">%1$d अनुप्रयोगमाथि बन्देज लगाउने हो?</item>
- <item quantity="one">अनुप्रयोगमाथि बन्देज लगाउने हो?</item>
+ <item quantity="other">%1$d एपमाथि बन्देज लगाउने हो?</item>
+ <item quantity="one">एपमाथि बन्देज लगाउने हो?</item>
</plurals>
<string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"ब्याट्री जोगाउन, <xliff:g id="APP">%1$s</xliff:g> लाई पृष्ठभूमिमा ब्याट्री प्रयोग गर्नबाट रोक्नुहोस्। यो अनुप्रयोगले सही किसिमले काम नगर्न सक्छ र सूचनाहरू आइपुग्न ढिलाइ हुन सक्छ।"</string>
<string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"ब्याट्री जोगाउन, यी एपहरूलाई पृष्ठभूमिमा ब्याट्री प्रयोग गर्नबाट रोक्नुहोस्। प्रतिबन्ध लगाइएका एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आइपुग्न ढिलाइ हुन सक्छ।\n\nएपहरू:"</string>
@@ -3486,7 +3485,7 @@
<string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"रद्द गर्नुहोस्"</string>
<string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"सक्रिय / वार्तालापहरू तैरने आइकनका रूपमा देखिन सक्छन्"</string>
<string name="notifications_bubble_setting_title" msgid="8287649393774855268">"एपहरूलाई बबल देखाउन दिनुहोस्"</string>
- <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"केही वार्तालापहरू तैरने आइकनका रूपमा अन्य अनुप्रयोगहरूमाथि देखिने छन्"</string>
+ <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"केही वार्तालापहरू तैरने आइकनका रूपमा अन्य एपमाथि देखिने छन्"</string>
<string name="bubble_app_setting_all" msgid="312524752846978277">"सबै वार्तालापहरू बबलमा देखाउन दिनुहोस्"</string>
<string name="bubble_app_setting_selected" msgid="4324386074198040675">"चयन गरिएका वार्तालापहरू बबलमा देखिन सक्छन्"</string>
<string name="bubble_app_setting_none" msgid="8643594711863996418">"कुनै पनि वार्तालाप बबलमा देखाउन नदिनुहोस्"</string>
@@ -4600,7 +4599,7 @@
<string name="webview_disabled_for_user" msgid="5809886172032644498">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
<string name="autofill_app" msgid="7595308061826307921">"स्वतः भरण सेवा"</string>
<string name="autofill_keywords" msgid="6260653325195017912">"स्वतः, भरण, स्वतः भरण"</string>
- <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
+ <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>तपाईं यो एपमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
<string name="debug_autofill_category" msgid="5998163555428196185">"स्वतः भरण"</string>
<string name="autofill_logging_level_title" msgid="3733958845861098307">"लगिङको स्तर"</string>
<string name="autofill_max_partitions" msgid="7342195529574406366">"प्रति सत्र अनुरोधको अधिकतम सङ्ख्या"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index cfa78dc..04096ca 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍ ଆକାଉଣ୍ଟ"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"କାର୍ଯ୍ୟ ଆକାଉଣ୍ଟ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"ବ୍ୟକ୍ତିଗତ ଆକାଉଣ୍ଟ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"ସନ୍ଧାନ"</string>
+ <string name="search_settings" msgid="7573686516434589771">"Search"</string>
<string name="display_settings" msgid="7197750639709493852">"ଡିସ୍ପ୍ଲେ"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"ଅଟୋ-ରୋଟେଟ୍ ସ୍କ୍ରିନ୍"</string>
<string name="color_mode_title" msgid="8666690832113906028">"ରଙ୍ଗ"</string>
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"ସ୍ମୁଥ୍ ଡିସପ୍ଲେ"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"କିଛି ବିଷୟବସ୍ତୁ ପାଇଁ ରିଫ୍ରେସ୍ ରେଟ୍ ସ୍ୱଚାଳିତ ଭାବରେ 60ରୁ 90 Hz ପର୍ଯ୍ୟନ୍ତ ବଢ଼ାଇଥାଏ। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ରିଫ୍ରେସ୍ ହାର ଲାଗୁ କରନ୍ତୁ"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ଉନ୍ନତ ସ୍ପର୍ଶ ପ୍ରତିକ୍ରିୟା ଓ ଆନିମେସନ୍ ଗୁଣବତ୍ତା ପାଇଁ ସର୍ବାଧିକ ରିଫ୍ରେସ୍ ରେଟ୍। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"ସ୍କ୍ରିନ୍ ଆଟେନ୍ସନ୍"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ଯଦି ଆପଣ ଏହାକୁ ଦେଖୁଥିବେ ତେବେ ଚାଲୁ / ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବ ନାହିଁ"</string>
@@ -2349,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"ବନ୍ଦ"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"ସେବା ଯୋଗ କରନ୍ତୁ"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"ପ୍ରିଣ୍ଟର୍ ଯୋଗ କରନ୍ତୁ"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"ସର୍ଚ୍ଚ"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"Search"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"ପ୍ରିଣ୍ଟର୍ ଖୋଜୁଛି"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"ସେବା ବନ୍ଦ ଅଛି"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"ପ୍ରିଣ୍ଟ ଜବ୍"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 0e129a8..138e254 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"ਸਮੂਥ ਡਿਸਪਲੇ"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਕੁਝ ਸਮੱਗਰੀਆਂ ਲਈ ਰਿਫ੍ਰੈਸ਼ ਦਰ ਨੂੰ 60 ਤੋਂ ਵਧਾ ਕੇ 90 Hz ਕਰ ਦਿੰਦਾ ਹੈ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ਰਿਫ੍ਰੈਸ਼ ਦਰ ਸੈੱਟ ਕਰੋ"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ਬਿਹਤਰ ਸਪਰਸ਼ ਪ੍ਰਤੀਕਿਰਿਆ ਅਤੇ ਐਨੀਮੇਸ਼ਨ ਕੁਆਲਿਟੀ ਲਈ ਉੱਚਤਮ ਰਿਫ੍ਰੈਸ਼ ਦਰ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"ਸਕ੍ਰੀਨ ਦਾ ਚੌਕੰਨਾਪਣ"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ਚਾਲੂ / ਸਕ੍ਰੀਨ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ ਜੇ ਤੁਸੀਂ ਉਸ ਵੱਲ ਦੇਖ ਰਹੇ ਹੋ"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index dbba111..8ecb744 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1149,7 +1149,7 @@
<string name="accessibility_category_personal" msgid="2228088849803484780">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
<string name="accessibility_work_account_title" msgid="7622485151217943839">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"వ్యక్తిగత ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="search_settings" msgid="7573686516434589771">"వెతుకు"</string>
+ <string name="search_settings" msgid="7573686516434589771">"సెర్చ్"</string>
<string name="display_settings" msgid="7197750639709493852">"డిస్ప్లే"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"స్క్రీన్ ఆటో-రొటేట్"</string>
<string name="color_mode_title" msgid="8666690832113906028">"రంగులు"</string>
@@ -2348,7 +2348,7 @@
<string name="print_feature_state_off" msgid="1466195699995209446">"ఆఫ్"</string>
<string name="print_menu_item_add_service" msgid="1549091062463044676">"సేవను జోడించు"</string>
<string name="print_menu_item_add_printer" msgid="8711630848324870892">"ప్రింటర్ను జోడించు"</string>
- <string name="print_menu_item_search" msgid="5989979785203603169">"వెతుకు"</string>
+ <string name="print_menu_item_search" msgid="5989979785203603169">"సెర్చ్"</string>
<string name="print_searching_for_printers" msgid="5401413178028348800">"ప్రింటర్ల కోసం వెతుకుతోంది"</string>
<string name="print_service_disabled" msgid="9185935228930987786">"సేవ నిలిపివేయబడింది"</string>
<string name="print_print_jobs" msgid="2605944855933091183">"ముద్రణ జాబ్లు"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 617ef24..66c2717 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1190,8 +1190,7 @@
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"ہموار ڈسپلے"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"کچھ مواد کے لیے 60 سے 90 Hz تک ریفریش کی شرح خودکار طور پر بڑھ جاتی ہے۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
- <!-- no translation found for force_high_refresh_rate_toggle (5861514655252832828) -->
- <skip />
+ <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"زبردستی 90 Hz ریفریش کی شرح"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"اعلی ترین ریفریش کرنے کی بہتر شرح کے ليے ٹچ کی کارکردگی اور اینیمیشن کوالٹی۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"اسکرین پر توجہ"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"اگر آپ آن اسکرین دیکھ رہے ہیں تو یہ آف نہیں ہوگی"</string>
diff --git a/src/com/android/settings/display/darkmode/TimeFormatter.java b/src/com/android/settings/display/darkmode/TimeFormatter.java
index 1032fe1..32ff026 100644
--- a/src/com/android/settings/display/darkmode/TimeFormatter.java
+++ b/src/com/android/settings/display/darkmode/TimeFormatter.java
@@ -18,26 +18,29 @@
import android.content.Context;
import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Locale;
+import java.util.Calendar;
+import java.util.TimeZone;
/**
* Formats LocalTime to the locale time string format
*/
public class TimeFormatter {
private final Context mContext;
- private final DateTimeFormatter mFormatter;
+ private final java.text.DateFormat mFormatter;
public TimeFormatter(Context context) {
mContext = context;
- Locale locale = mContext.getResources().getConfiguration().locale;
- if (locale == null) {
- locale = Locale.getDefault();
- }
- mFormatter = DateTimeFormatter.ofPattern("hh:mm a", locale);
+ mFormatter = android.text.format.DateFormat.getTimeFormat(context);
+ mFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
}
public String of(LocalTime time) {
- return mFormatter.format(time);
+ final Calendar c = Calendar.getInstance();
+ c.setTimeZone(mFormatter.getTimeZone());
+ c.set(Calendar.HOUR_OF_DAY, time.getHour());
+ c.set(Calendar.MINUTE, time.getMinute());
+ c.set(Calendar.SECOND, 0);
+ c.set(Calendar.MILLISECOND, 0);
+ return mFormatter.format(c.getTime());
}
public boolean is24HourFormat() {
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java
index 7f29ecb..684e658 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java
@@ -24,6 +24,9 @@
/** Get contextual cards from the card provider */
Cursor getContextualCards();
+ /** Get the default contextual card to display */
+ ContextualCard getDefaultContextualCard();
+
/**
* Mark a specific {@link ContextualCard} as dismissed with dismissal signal in the database
* to indicate that the card has been dismissed.
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java
index 5059d90..643625b 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java
@@ -55,6 +55,11 @@
}
@Override
+ public ContextualCard getDefaultContextualCard() {
+ return null;
+ }
+
+ @Override
public int markCardAsDismissed(Context context, String cardName) {
final SQLiteDatabase db = CardDatabaseHelper.getInstance(mContext).getWritableDatabase();
final ContentValues values = new ContentValues();
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index de7eda2..81ea45a 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -164,6 +164,16 @@
SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,
ContextualCardLogUtils.buildCardListLog(hiddenCards));
}
+
+ // Add a default card if no other visible cards
+ if (visibleCards.isEmpty() && maxCardCount == 1) {
+ final ContextualCard defaultCard = FeatureFactory.getFactory(mContext)
+ .getContextualCardFeatureProvider(mContext).getDefaultContextualCard();
+ if (defaultCard != null) {
+ Log.i(TAG, "Default card: " + defaultCard.getSliceUri());
+ visibleCards.add(defaultCard);
+ }
+ }
return visibleCards;
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index c9ec5cf..b631102 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -47,7 +47,6 @@
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
-import com.android.settings.homepage.contextualcards.slices.SliceFullCardRendererHelper.SliceViewHolder;
import com.android.settingslib.utils.ThreadUtils;
import java.util.Map;
@@ -105,7 +104,7 @@
// Show cached slice first before slice binding completed to avoid jank.
if (holder.getItemViewType() != VIEW_TYPE_HALF_WIDTH) {
- ((SliceViewHolder) holder).sliceView.setSlice(card.getSlice());
+ mFullCardHelper.bindView(holder, card, card.getSlice());
}
LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri);
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index 0a9c9b9..cfd587a 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -126,10 +126,8 @@
final CellSignalStrength signalStrength = getCellSignalStrength(mCellInfo);
final int level = signalStrength != null ? signalStrength.getLevel() : LEVEL_NONE;
if (DBG) Log.d(TAG, "refresh level: " + String.valueOf(level));
- if (mLevel != level) {
- mLevel = level;
- updateIcon(mLevel);
- }
+ mLevel = level;
+ updateIcon(mLevel);
}
/**
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
index ea9a745..4d3c60b 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
@@ -25,6 +25,7 @@
import android.net.Uri;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
+import android.provider.Settings;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -45,6 +46,9 @@
public class ContextualWifiSlice extends WifiSlice {
@VisibleForTesting
+ static final String CONTEXTUAL_WIFI_EXPANDABLE = "contextual_wifi_expandable";
+
+ @VisibleForTesting
static final int COLLAPSED_ROW_COUNT = 0;
@VisibleForTesting
@@ -63,13 +67,17 @@
@Override
public Slice getSlice() {
- final long currentUiSession = FeatureFactory.getFactory(mContext)
- .getSlicesFeatureProvider().getUiSessionToken();
- if (currentUiSession != sActiveUiSession) {
- sActiveUiSession = currentUiSession;
- sApRowCollapsed = hasWorkingNetwork();
- } else if (!mWifiManager.isWifiEnabled()) {
- sApRowCollapsed = false;
+ if (isExpandable()) {
+ final long currentUiSession = FeatureFactory.getFactory(mContext)
+ .getSlicesFeatureProvider().getUiSessionToken();
+ if (currentUiSession != sActiveUiSession) {
+ sActiveUiSession = currentUiSession;
+ sApRowCollapsed = hasWorkingNetwork();
+ } else if (!mWifiManager.isWifiEnabled()) {
+ sApRowCollapsed = false;
+ }
+ } else {
+ sApRowCollapsed = true;
}
return super.getSlice();
}
@@ -87,12 +95,18 @@
protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {
final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, accessPoint);
builder.setTitleItem(getHeaderIcon(isWifiEnabled, accessPoint), ListBuilder.ICON_IMAGE);
- if (sApRowCollapsed) {
+ if (sApRowCollapsed && isWifiEnabled) {
builder.setSubtitle(getSubtitle(accessPoint));
}
return builder;
}
+ private boolean isExpandable() {
+ // Return whether this slice can be expandable.
+ return Settings.Global.getInt(mContext.getContentResolver(), CONTEXTUAL_WIFI_EXPANDABLE, 0)
+ != 0;
+ }
+
private IconCompat getHeaderIcon(boolean isWifiEnabled, AccessPoint accessPoint) {
final Drawable drawable;
final int tint;
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
index 54b7c2d..fe1bb11 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
@@ -30,6 +30,7 @@
import android.net.NetworkCapabilities;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
+import android.provider.Settings;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.Slice;
@@ -77,6 +78,9 @@
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
mWifiManager.setWifiEnabled(true);
+ // Set WifiSlice expandable
+ Settings.Global.putInt(mContext.getContentResolver(),
+ ContextualWifiSlice.CONTEXTUAL_WIFI_EXPANDABLE, 1);
mWifiSlice = new ContextualWifiSlice(mContext);
}
@@ -127,6 +131,18 @@
}
@Test
+ public void getWifiSlice_notExpandable_shouldCollapseSlice() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ ContextualWifiSlice.CONTEXTUAL_WIFI_EXPANDABLE, 0);
+ mWifiSlice.sApRowCollapsed = false;
+
+ final Slice wifiSlice = mWifiSlice.getSlice();
+
+ assertWifiHeader(wifiSlice);
+ assertThat(ContextualWifiSlice.getApRowCount()).isEqualTo(COLLAPSED_ROW_COUNT);
+ }
+
+ @Test
public void getWifiSlice_contextualWifiSlice_shouldReturnContextualWifiSliceUri() {
mWifiSlice.sActiveUiSession = mFeatureFactory.slicesFeatureProvider.getUiSessionToken();