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

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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29559390', 'googleplex-android-review.googlesource.com/29611520', 'googleplex-android-review.googlesource.com/29657152', 'googleplex-android-review.googlesource.com/29690065', 'googleplex-android-review.googlesource.com/29583487', 'googleplex-android-review.googlesource.com/29663180', 'googleplex-android-review.googlesource.com/29663286', 'googleplex-android-review.googlesource.com/29663288', 'googleplex-android-review.googlesource.com/29663293', 'googleplex-android-review.googlesource.com/29663365', 'googleplex-android-review.googlesource.com/29663367', 'googleplex-android-review.googlesource.com/29663368', 'googleplex-android-review.googlesource.com/29663371', 'googleplex-android-review.googlesource.com/29663372', 'googleplex-android-review.googlesource.com/29664288', 'googleplex-android-review.googlesource.com/29670255', 'googleplex-android-review.googlesource.com/29670256'] into 24Q4-release.

Change-Id: If2dec7e7844866e531a48cdabd930ebebe281657
parents df1b69eb fea788b8

core/java/android/app/IUserSwitchObserver.aidl

+5 −5
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package android.app; 
import android.os.IRemoteCallback;



/** {@hide} */

oneway interface IUserSwitchObserver {

interface IUserSwitchObserver {

    void onBeforeUserSwitching(int newUserId);

    void onUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitchComplete(int newUserId);

    void onForegroundProfileSwitch(int newProfileId);

    void onLockedBootComplete(int newUserId);

    oneway void onUserSwitching(int newUserId, IRemoteCallback reply);

    oneway void onUserSwitchComplete(int newUserId);

    oneway void onForegroundProfileSwitch(int newProfileId);

    oneway void onLockedBootComplete(int newUserId);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -2408,9 +2408,9 @@ 
    <string name="keyboard_layout_notification_more_than_three_selected_message" msgid="1581834181578206937">"За клавиатурната подредба са зададени <xliff:g id="LAYOUT_1">%1$s</xliff:g>, <xliff:g id="LAYOUT_2">%2$s</xliff:g> и <xliff:g id="LAYOUT_3">%3$s</xliff:g>… Докоснете за промяна."</string>

    <string name="keyboard_layout_notification_multiple_selected_title" msgid="5242444914367024499">"Физическите клавиатури са конфигурирани"</string>

    <string name="keyboard_layout_notification_multiple_selected_message" msgid="6576533454124419202">"Докоснете за преглед на клавиатурите"</string>

    <string name="profile_label_private" msgid="6463418670715290696">"Частни"</string>

    <string name="profile_label_private" msgid="6463418670715290696">"Частен"</string>

    <string name="profile_label_clone" msgid="769106052210954285">"Клониране"</string>

    <string name="profile_label_work" msgid="3495359133038584618">"Служебни"</string>

    <string name="profile_label_work" msgid="3495359133038584618">"Служебен"</string>

    <string name="profile_label_work_2" msgid="4691533661598632135">"Служебни 2"</string>

    <string name="profile_label_work_3" msgid="4834572253956798917">"Служебни 3"</string>

    <string name="profile_label_test" msgid="9168641926186071947">"Тестване"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -2154,7 +2154,7 @@ 
    <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"Uredu"</string>

    <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Isključi"</string>

    <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Saznajte više"</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila Prilagodljiva obavještenja Androida u verziji Android 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila prilagodljiva obavještenja Androida u verziji Android 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Obavještenje za informacije Rutinskog načina"</string>

    <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Ušteda baterije je uključena"</string>

    <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Smanjena je potrošnja baterije da se produži vijek trajanja baterije"</string>

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

+4 −4
Original line number Diff line number Diff line
@@ -2394,12 +2394,12 @@ 
    <string name="connected_display_unavailable_notification_content" msgid="3845903313751217516">"Utilitza un altre cable i torna-ho a provar"</string>

    <string name="connected_display_thermally_unavailable_notification_content" msgid="9205758199439955949">"El dispositiu està massa calent i no pot duplicar a la pantalla fins que es refredi"</string>

    <string name="concurrent_display_notification_name" msgid="1526911253558311131">"Pantalla dual"</string>

    <string name="concurrent_display_notification_active_title" msgid="4892473462327943673">"La pantalla dual està activada"</string>

    <string name="concurrent_display_notification_active_title" msgid="4892473462327943673">"Pantalla dual està activada"</string>

    <string name="concurrent_display_notification_active_content" msgid="5889355473710601270">"<xliff:g id="APP_NAME">%1$s</xliff:g> està utilitzant les dues pantalles per mostrar contingut"</string>

    <string name="concurrent_display_notification_thermal_title" msgid="5921609404644739229">"El dispositiu està massa calent"</string>

    <string name="concurrent_display_notification_thermal_content" msgid="2075484836527609319">"La pantalla dual no està disponible perquè el telèfon està massa calent"</string>

    <string name="concurrent_display_notification_power_save_title" msgid="1794569070730736281">"Dual Screen no està disponible"</string>

    <string name="concurrent_display_notification_power_save_content" msgid="2198116070583851493">"Dual Screen no està disponible perquè la funció Estalvi de bateria està activada. Pots desactivar aquesta opció a Configuració."</string>

    <string name="concurrent_display_notification_thermal_content" msgid="2075484836527609319">"Pantalla dual no està disponible perquè el telèfon està massa calent"</string>

    <string name="concurrent_display_notification_power_save_title" msgid="1794569070730736281">"Pantalla dual no està disponible"</string>

    <string name="concurrent_display_notification_power_save_content" msgid="2198116070583851493">"Pantalla dual no està disponible perquè la funció Estalvi de bateria està activada. Pots desactivar aquesta opció a Configuració."</string>

    <string name="device_state_notification_settings_button" msgid="691937505741872749">"Ves a Configuració"</string>

    <string name="device_state_notification_turn_off_button" msgid="6327161707661689232">"Desactiva"</string>

    <string name="keyboard_layout_notification_selected_title" msgid="1202560174252421219">"<xliff:g id="DEVICE_NAME">%s</xliff:g> configurat"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -2153,7 +2153,7 @@ 
    <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string>

    <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Deaktiver"</string>

    <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Få flere oplysninger"</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Tilpassede Android-notifikationer blev erstattet af forbedrede notifikationer i Android 12. Denne funktion viser foreslåede handlinger og svar samt organiserer dine notifikationer.\n\nForbedrede notifikationer kan få adgang til indhold i notifikationer, bl.a. personlige oplysninger såsom beskeder og navne på kontakter. Funktionen kan også afvise eller svare på notifikationer, f.eks. ved at besvare telefonopkald og justere Forstyr ikke."</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Adaptive Android-notifikationer blev erstattet af forbedrede notifikationer i Android 12. Denne funktion viser foreslåede handlinger og svar samt organiserer dine notifikationer.\n\nForbedrede notifikationer kan få adgang til indhold i notifikationer, bl.a. personlige oplysninger såsom beskeder og navne på kontakter. Funktionen kan også afvise eller svare på notifikationer, f.eks. ved at besvare telefonopkald og justere Forstyr ikke."</string>

    <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Notifikation med oplysninger om rutinetilstand"</string>

    <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Batterisparefunktion er aktiveret"</string>

    <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Reducerer batteriforbruget for at forlænge batteritiden"</string>