Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6579776 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999', 'googleplex-android-review.googlesource.com/26877731', 'googleplex-android-review.googlesource.com/26877737', 'googleplex-android-review.googlesource.com/26877738', 'googleplex-android-review.googlesource.com/26878334', 'googleplex-android-review.googlesource.com/26878335', 'googleplex-android-review.googlesource.com/26878463', 'googleplex-android-review.googlesource.com/26878464', 'googleplex-android-review.googlesource.com/26878465', 'googleplex-android-review.googlesource.com/26878466', 'googleplex-android-review.googlesource.com/26878737', 'googleplex-android-review.googlesource.com/26878738', 'googleplex-android-review.googlesource.com/26878741', 'googleplex-android-review.googlesource.com/26878828', 'googleplex-android-review.googlesource.com/26878829', 'googleplex-android-review.googlesource.com/26878830', 'googleplex-android-review.googlesource.com/26878831', 'googleplex-android-review.googlesource.com/26878834', 'googleplex-android-review.googlesource.com/26879463', 'googleplex-android-review.googlesource.com/26879775', 'googleplex-android-review.googlesource.com/26879790'] into 24Q2-release.

Change-Id: I6cd90cf3773399322d27937356dad219c1816d7d
parents 799abfca 17465a56

core/java/android/hardware/devicestate/DeviceState.java

+4 −4
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ public final class DeviceState { 
    @Override

    public String toString() {

        return "DeviceState{" + "identifier=" + mIdentifier + ", name='" + mName + '\''

                + ", app_accessible=" + !hasProperty(PROPERTY_APP_INACCESSIBLE)

                + ", cancel_when_requester_not_on_top="

                + hasProperty(PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)

                + "}";

                + ", app_accessible=" + !(hasProperty(PROPERTY_APP_INACCESSIBLE)

                || hasFlag(FLAG_APP_INACCESSIBLE)) + ", cancel_when_requester_not_on_top="

                + (hasProperty(PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)

                || hasFlag(FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)) + "}";

    }



    @Override

core/res/res/values-af/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ 
    <string name="global_action_emergency" msgid="1387617624177105088">"Noodgeval"</string>

    <string name="global_action_bug_report" msgid="5127867163044170003">"Foutverslag"</string>

    <string name="global_action_logout" msgid="6093581310002476511">"Beëindig sessie"</string>

    <string name="global_action_screenshot" msgid="2610053466156478564">"Skermkiekie"</string>

    <string name="global_action_screenshot" msgid="2610053466156478564">"Skermskoot"</string>

    <string name="bugreport_title" msgid="8549990811777373050">"Foutverslag"</string>

    <string name="bugreport_message" msgid="5212529146119624326">"Dit sal inligting oor die huidige toestand van jou toestel insamel om as \'n e-posboodskap te stuur. Dit sal \'n tydjie neem vandat die foutverslag begin is totdat dit reg is om gestuur te word; wees asseblief geduldig."</string>

    <string name="bugreport_option_interactive_title" msgid="7968287837902871289">"Interaktiewe verslag"</string>
@@ -357,7 +357,7 @@ 
    <string name="capability_desc_canTakeScreenshot" msgid="7762297374317934052">"Kan \'n skermkiekie neem."</string>

    <string name="dream_preview_title" msgid="5570751491996100804">"Voorskou, <xliff:g id="DREAM_NAME">%1$s</xliff:g>"</string>

    <string name="permlab_statusBar" msgid="8798267849526214017">"deaktiveer of verander statusbalk"</string>

    <string name="permdesc_statusBar" msgid="5809162768651019642">"Laat die program toe om die statusbalk te deaktiveer en stelselikone by te voeg of te verwyder."</string>

    <string name="permdesc_statusBar" msgid="5809162768651019642">"Laat die app toe om die statusbalk te deaktiveer en stelselikone by te voeg of te verwyder."</string>

    <string name="permlab_statusBarService" msgid="2523421018081437981">"wees die statusbalk"</string>

    <string name="permdesc_statusBarService" msgid="6652917399085712557">"Laat die program toe om die statusbalk te wees."</string>

    <string name="permlab_expandStatusBar" msgid="1184232794782141698">"vou statusbalk in of uit"</string>
@@ -1424,7 +1424,7 @@ 
    <string name="select_keyboard_layout_notification_message" msgid="8835158247369158154">"Tik om taal en uitleg te kies"</string>

    <string name="fast_scroll_alphabet" msgid="8854435958703888376">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>

    <string name="fast_scroll_numeric_alphabet" msgid="2529539945421557329">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>

    <string name="alert_windows_notification_channel_group_name" msgid="6063891141815714246">"Wys bo-oor ander programme"</string>

    <string name="alert_windows_notification_channel_group_name" msgid="6063891141815714246">"Wys bo-oor ander apps"</string>

    <string name="alert_windows_notification_channel_name" msgid="3437528564303192620">"<xliff:g id="NAME">%s</xliff:g> word bo-oor ander programme gewys"</string>

    <string name="alert_windows_notification_title" msgid="6331662751095228536">"<xliff:g id="NAME">%s</xliff:g> wys bo-oor ander programme"</string>

    <string name="alert_windows_notification_message" msgid="6538171456970725333">"As jy nie wil hê dat <xliff:g id="NAME">%s</xliff:g> hierdie kenmerk gebruik nie, tik om instellings oop te maak en skakel dit af."</string>
@@ -1965,7 +1965,7 @@ 
    <string name="default_notification_channel_label" msgid="3697928973567217330">"Ongekategoriseer"</string>

    <string name="importance_from_user" msgid="2782756722448800447">"Jy stel die belangrikheid van hierdie kennisgewings."</string>

    <string name="importance_from_person" msgid="4235804979664465383">"Dit is belangrik as gevolg van die mense wat betrokke is."</string>

    <string name="notification_history_title_placeholder" msgid="7748630986182249599">"Gepasmaakte programkennisgewing"</string>

    <string name="notification_history_title_placeholder" msgid="7748630986182249599">"Gepasmaakte appkennisgewing"</string>

    <string name="user_creation_account_exists" msgid="2239146360099708035">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om \'n nuwe gebruiker met <xliff:g id="ACCOUNT">%2$s</xliff:g> te skep (\'n gebruiker met hierdie rekening bestaan reeds)?"</string>

    <string name="user_creation_adding" msgid="7305185499667958364">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om \'n nuwe gebruiker met <xliff:g id="ACCOUNT">%2$s</xliff:g> te skep?"</string>

    <string name="supervised_user_creation_label" msgid="6884904353827427515">"Voeg gebruiker onder toesig by"</string>
@@ -2026,7 +2026,7 @@ 
    <string name="pin_specific_target" msgid="7824671240625957415">"Speld <xliff:g id="LABEL">%1$s</xliff:g> vas"</string>

    <string name="unpin_target" msgid="3963318576590204447">"Ontspeld"</string>

    <string name="unpin_specific_target" msgid="3859828252160908146">"Ontspeld <xliff:g id="LABEL">%1$s</xliff:g>"</string>

    <string name="app_info" msgid="6113278084877079851">"Programinligting"</string>

    <string name="app_info" msgid="6113278084877079851">"Appinligting"</string>

    <string name="negative_duration" msgid="1938335096972945232">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="demo_starting_message" msgid="6577581216125805905">"Begin tans demonstrasie …"</string>

    <string name="demo_restarting_message" msgid="1160053183701746766">"Stel toestel tans terug …"</string>
@@ -2171,7 +2171,7 @@ 
    <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Kitsinstellings"</string>

    <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Kragdialoog"</string>

    <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Sluitskerm"</string>

    <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Skermkiekie"</string>

    <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Skermskoot"</string>

    <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"Kopstuk haak"</string>

    <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"Toeganklikheidkortpad op skerm"</string>

    <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"Toeganklikheidkortpadkieser op skerm"</string>

core/res/res/values-ar/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ 
    <string name="permgroupdesc_contacts" msgid="9163927941244182567">"الوصول إلى جهات اتصالك"</string>

    <string name="permgrouplab_location" msgid="1858277002233964394">"الموقع الجغرافي"</string>

    <string name="permgroupdesc_location" msgid="1995955142118450685">"الوصول إلى موقع هذا الجهاز"</string>

    <string name="permgrouplab_calendar" msgid="6426860926123033230">"التقويم"</string>

    <string name="permgrouplab_calendar" msgid="6426860926123033230">"‏تقويم Google"</string>

    <string name="permgroupdesc_calendar" msgid="6762751063361489379">"الوصول إلى تقويمك"</string>

    <string name="permgrouplab_sms" msgid="795737735126084874">"SMS"</string>

    <string name="permgroupdesc_sms" msgid="5726462398070064542">"‏إرسال رسائل قصيرة SMS وعرضها"</string>
@@ -999,7 +999,7 @@ 
    <string name="lockscreen_pattern_correct" msgid="8050630103651508582">"صحيح!"</string>

    <string name="lockscreen_pattern_wrong" msgid="2940138714468358458">"أعد المحاولة"</string>

    <string name="lockscreen_password_wrong" msgid="8605355913868947490">"أعد المحاولة"</string>

    <string name="lockscreen_storage_locked" msgid="634993789186443380">"فتح قفل جميع الميزات والبيانات"</string>

    <string name="lockscreen_storage_locked" msgid="634993789186443380">"فتح القفل للوصول إلى جميع الميزات والبيانات"</string>

    <string name="faceunlock_multiple_failures" msgid="681991538434031708">"تم تجاوز الحد الأقصى لعدد محاولات فتح الجهاز بالتعرف على الوجه"</string>

    <string name="lockscreen_missing_sim_message_short" msgid="1229301273156907613">"‏لا تتوفر شريحة SIM."</string>

    <string name="lockscreen_missing_sim_message" product="tablet" msgid="3986843848305639161">"‏لا تتوفر شريحة SIM في الجهاز اللوحي."</string>
@@ -1285,7 +1285,7 @@ 
    <string name="android_upgrading_starting_apps" msgid="6206161195076057075">"بدء التطبيقات."</string>

    <string name="android_upgrading_complete" msgid="409800058018374746">"جارٍ إعادة التشغيل."</string>

    <string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"ضغطت على زر التشغيل، يؤدي هذا عادةً إلى إيقاف الشاشة.\n\nجرِّب النقر بخفة أثناء إعداد بصمتك."</string>

    <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"لإيقاف عملية الإعداد، أغلِق الشاشة."</string>

    <string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"لإيقاف عملية الإعداد، أغلِق الشاشة"</string>

    <string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"إيقاف"</string>

    <string name="fp_power_button_bp_title" msgid="5585506104526820067">"هل تريد مواصلة تأكيد بصمة إصبعك؟"</string>

    <string name="fp_power_button_bp_message" msgid="2983163038168903393">"ضغطت على زر التشغيل، يؤدي هذا عادةً إلى إيقاف الشاشة.\n\nجرِّب النقر بخفة لتأكيد بصمة إصبعك."</string>
@@ -1399,7 +1399,7 @@ 
    <string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"تم اكتشاف ملحق صوتي تناظري"</string>

    <string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"الجهاز الذي تم توصيله بالهاتف غير متوافق معه. انقر للحصول على المزيد من المعلومات."</string>

    <string name="adb_active_notification_title" msgid="408390247354560331">"‏تم توصيل USB لتصحيح أخطاء الجهاز"</string>

    <string name="adb_active_notification_message" msgid="5617264033476778211">"‏انقر لإيقاف تصحيح أخطاء الجهاز عبر USB."</string>

    <string name="adb_active_notification_message" msgid="5617264033476778211">"‏انقر لإيقاف تصحيح أخطاء الجهاز عبر USB"</string>

    <string name="adb_active_notification_message" product="tv" msgid="6624498401272780855">"‏اختيار إيقاف تصحيح أخطاء USB."</string>

    <string name="adbwifi_active_notification_title" msgid="6147343659168302473">"تم تفعيل ميزة \"تصحيح الأخطاء اللاسلكي\"."</string>

    <string name="adbwifi_active_notification_message" msgid="930987922852867972">"انقر لإيقاف ميزة \"تصحيح الأخطاء اللاسلكي\"."</string>
@@ -1658,7 +1658,7 @@ 
    <string name="media_route_button_content_description" msgid="2299223698196869956">"البث"</string>

    <string name="media_route_chooser_title" msgid="6646594924991269208">"الاتصال بجهاز"</string>

    <string name="media_route_chooser_title_for_remote_display" msgid="3105906508794326446">"بث الشاشة على الجهاز"</string>

    <string name="media_route_chooser_searching" msgid="6119673534251329535">"جارٍ البحث عن الأجهزة…"</string>

    <string name="media_route_chooser_searching" msgid="6119673534251329535">"جارٍ البحث عن أجهزة…"</string>

    <string name="media_route_chooser_extended_settings" msgid="2506352159381327741">"الإعدادات"</string>

    <string name="media_route_controller_disconnect" msgid="7362617572732576959">"قطع الاتصال"</string>

    <string name="media_route_status_scanning" msgid="8045156315309594482">"البحث عن الشبكات..."</string>
@@ -1992,7 +1992,7 @@ 
    <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"الطوارئ"</string>

    <string name="set_up_screen_lock_title" msgid="8346083801616474030">"ضبط قفل شاشة"</string>

    <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"ضبط قفل الشاشة"</string>

    <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"لاستخدام مساحتك الخاصة، يجب ضبط قفل شاشة على هذا الجهاز."</string>

    <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"لاستخدام مساحتك الخاصة، يجب ضبط قفل شاشة على هذا الجهاز"</string>

    <string name="app_blocked_title" msgid="7353262160455028160">"التطبيق غير متاح"</string>

    <string name="app_blocked_message" msgid="542972921087873023">"تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> غير متاح الآن."</string>

    <string name="app_streaming_blocked_title" msgid="6090945835898766139">"تطبيق <xliff:g id="ACTIVITY">%1$s</xliff:g> غير متاح"</string>

core/res/res/values-as/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ 
    <string name="work_mode_emergency_call_button" msgid="6818855962881612322">"জৰুৰীকালীন"</string>

    <string name="set_up_screen_lock_title" msgid="8346083801616474030">"এটা স্ক্ৰীন লক ছেট কৰক"</string>

    <string name="set_up_screen_lock_action_label" msgid="2687634803649209367">"স্ক্ৰীন লক ছেট কৰা"</string>

    <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"আপোনাৰ প্ৰাইভেট স্পেচ ব্যৱহাৰ কৰিবলৈ এই ডিভাইচটোত স্ক্ৰীন লক ছেট কৰক"</string>

    <string name="private_space_set_up_screen_lock_message" msgid="1109956797005149814">"আপোনাৰ প্ৰাইভেট স্পে\'চ ব্যৱহাৰ কৰিবলৈ এই ডিভাইচটোত স্ক্ৰীন লক ছেট কৰক"</string>

    <string name="app_blocked_title" msgid="7353262160455028160">"এপ্‌টো উপলব্ধ নহয়"</string>

    <string name="app_blocked_message" msgid="542972921087873023">"এই মুহূৰ্তত <xliff:g id="APP_NAME">%1$s</xliff:g> উপলব্ধ নহয়।"</string>

    <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> উপলব্ধ নহয়"</string>

core/res/res/values-b+sr+Latn/strings.xml

+19 −19

File changed.

Preview size limit exceeded, changes collapsed.