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

Commit 2bae306f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6981467 from ae2d666d to rvc-qpr2-release 

Change-Id: I8cb5dbd45211b28ea918991b2f05e4267e22daa7
parents 8eee997d ae2d666d

core/java/android/app/admin/DevicePolicyManager.java

+6 −0
Original line number Diff line number Diff line
@@ -4263,6 +4263,9 @@ public class DevicePolicyManager { 
     * This method can be called on the {@link DevicePolicyManager} instance returned by

     * {@link #getParentProfileInstance(ComponentName)} in order to lock the parent profile.

     * <p>

     * NOTE: on {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive builds}, this

     * method doesn't turn off the screen as it would be a driving safety distraction.

     * <p>

     * Equivalent to calling {@link #lockNow(int)} with no flags.

     *

     * @throws SecurityException if the calling application does not own an active administrator
@@ -4306,6 +4309,9 @@ public class DevicePolicyManager { 
     * Calling the method twice in this order ensures that all users are locked and does not

     * stop the device admin on the managed profile from issuing a second call to lock its own

     * profile.

     * <p>

     * NOTE: on {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive builds}, this

     * method doesn't turn off the screen as it would be a driving safety distraction.

     *

     * @param flags May be 0 or {@link #FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY}.

     * @throws SecurityException if the calling application does not own an active administrator

core/java/android/inputmethodservice/InputMethodService.java

+0 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,6 @@ public class InputMethodService extends AbstractInputMethodService { 
                WindowManager.LayoutParams.TYPE_INPUT_METHOD, Gravity.BOTTOM, false);

        mWindow.getWindow().getAttributes().setFitInsetsTypes(statusBars() | navigationBars());

        mWindow.getWindow().getAttributes().setFitInsetsSides(Side.all() & ~Side.BOTTOM);

        mWindow.getWindow().getAttributes().setFitInsetsIgnoringVisibility(true);



        // IME layout should always be inset by navigation bar, no matter its current visibility,

        // unless automotive requests it. Automotive devices may request the navigation bar to be

packages/SystemUI/res/values-fr-rCA/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
    <string name="notification_group_overflow_indicator" msgid="7605120293801012648">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string>

    <plurals name="notification_group_overflow_description" formatted="false" msgid="91483442850649192">

      <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item>

      <item quantity="many"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>

      <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item>

    </plurals>

    <string name="notification_summary_message_format" msgid="5158219088501909966">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> : <xliff:g id="MESSAGE_CONTENT">%2$s</xliff:g>"</string>
@@ -400,6 +401,7 @@ 
    <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"Écon. données activé"</string>

    <plurals name="quick_settings_hotspot_secondary_label_num_devices" formatted="false" msgid="3142308865165871976">

      <item quantity="one">%d appareil</item>

      <item quantity="many">%d devices</item>

      <item quantity="other">%d appareils</item>

    </plurals>

    <string name="quick_settings_notifications_label" msgid="3379631363952582758">"Notifications"</string>
@@ -459,7 +461,7 @@ 
    <string name="camera_hint" msgid="4519495795000658637">"Balayez à partir de l\'icône pour accéder à l\'appareil photo"</string>

    <string name="interruption_level_none_with_warning" msgid="8394434073508145437">"Aucune interruption : le son des lecteurs d\'écran sera également désactivé."</string>

    <string name="interruption_level_none" msgid="219484038314193379">"Aucune interruption"</string>

    <string name="interruption_level_priority" msgid="661294280016622209">"Priorités seulement"</string>

    <string name="interruption_level_priority" msgid="661294280016622209">"Prioritaires seulement"</string>

    <string name="interruption_level_alarms" msgid="2457850481335846959">"Alarmes seulement"</string>

    <string name="interruption_level_none_twoline" msgid="8579382742855486372">"Aucune\ninterruption"</string>

    <string name="interruption_level_priority_twoline" msgid="8523482736582498083">"Priorités\nuniquement"</string>
@@ -492,6 +494,7 @@ 
    <string name="user_limit_reached_title" msgid="2429229448830346057">"Limite d\'utilisateurs atteinte"</string>

    <plurals name="user_limit_reached_message" formatted="false" msgid="2573535787802908398">

      <item quantity="one">Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> utilisateur.</item>

      <item quantity="many">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>

      <item quantity="other">Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> utilisateurs.</item>

    </plurals>

    <string name="user_remove_user_title" msgid="9124124694835811874">"Supprimer l\'utilisateur?"</string>
@@ -716,7 +719,7 @@ 
    <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Garde votre attention à l\'aide d\'un raccourci flottant vers ce contenu."</string>

    <string name="notification_channel_summary_priority" msgid="7952654515769021553">"S\'affiche en haut de la section des conversations sous forme de bulle flottante et affiche la photo du profil sur l\'écran de verrouillage"</string>

    <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Paramètres"</string>

    <string name="notification_priority_title" msgid="2079708866333537093">"Priorité"</string>

    <string name="notification_priority_title" msgid="2079708866333537093">"Prioritaire"</string>

    <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge les fonctionnalités de conversation"</string>

    <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Aucune bulle récente"</string>

    <string name="bubble_overflow_empty_subtitle" msgid="2030874469510497397">"Les bulles récentes et les bulles ignorées s\'afficheront ici"</string>
@@ -758,10 +761,12 @@ 
    <string name="snoozed_for_time" msgid="7586689374860469469">"Reporté pour <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string>

    <plurals name="snoozeHourOptions" formatted="false" msgid="2066838694120718170">

      <item quantity="one">%d heure</item>

      <item quantity="many">%d hours</item>

      <item quantity="other">%d heures</item>

    </plurals>

    <plurals name="snoozeMinuteOptions" formatted="false" msgid="8998483159208055980">

      <item quantity="one">%d minute</item>

      <item quantity="many">%d minutes</item>

      <item quantity="other">%d minutes</item>

    </plurals>

    <string name="battery_panel_title" msgid="5931157246673665963">"Utilisation de la pile"</string>
@@ -1040,6 +1045,7 @@ 
    <string name="controls_providers_title" msgid="6879775889857085056">"Sélectionnez l\'application pour laquelle ajouter des commandes"</string>

    <plurals name="controls_number_of_favorites" formatted="false" msgid="1057347832073807380">

      <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> commande ajoutée.</item>

      <item quantity="many"><xliff:g id="NUMBER_1">%s</xliff:g> controls added.</item>

      <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> commandes ajoutées.</item>

    </plurals>

    <string name="controls_removed" msgid="3731789252222856959">"Supprimé"</string>

packages/SystemUI/res/values-fr/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
    <string name="notification_group_overflow_indicator" msgid="7605120293801012648">"<xliff:g id="NUMBER">%s</xliff:g> autres"</string>

    <plurals name="notification_group_overflow_description" formatted="false" msgid="91483442850649192">

      <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item>

      <item quantity="many"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>

      <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item>

    </plurals>

    <string name="notification_summary_message_format" msgid="5158219088501909966">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> : <xliff:g id="MESSAGE_CONTENT">%2$s</xliff:g>"</string>
@@ -400,6 +401,7 @@ 
    <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"Écon. données activé"</string>

    <plurals name="quick_settings_hotspot_secondary_label_num_devices" formatted="false" msgid="3142308865165871976">

      <item quantity="one">%d appareil</item>

      <item quantity="many">%d devices</item>

      <item quantity="other">%d appareils</item>

    </plurals>

    <string name="quick_settings_notifications_label" msgid="3379631363952582758">"Notifications"</string>
@@ -492,6 +494,7 @@ 
    <string name="user_limit_reached_title" msgid="2429229448830346057">"Limite nombre utilisateurs atteinte"</string>

    <plurals name="user_limit_reached_message" formatted="false" msgid="2573535787802908398">

      <item quantity="one">Vous pouvez ajouter <xliff:g id="COUNT">%d</xliff:g> profil utilisateur.</item>

      <item quantity="many">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>

      <item quantity="other">Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> profils utilisateur.</item>

    </plurals>

    <string name="user_remove_user_title" msgid="9124124694835811874">"Supprimer l\'utilisateur ?"</string>
@@ -758,10 +761,12 @@ 
    <string name="snoozed_for_time" msgid="7586689374860469469">"Répétée après <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string>

    <plurals name="snoozeHourOptions" formatted="false" msgid="2066838694120718170">

      <item quantity="one">%d heure</item>

      <item quantity="many">%d hours</item>

      <item quantity="other">%d heures</item>

    </plurals>

    <plurals name="snoozeMinuteOptions" formatted="false" msgid="8998483159208055980">

      <item quantity="one">%d minute</item>

      <item quantity="many">%d minutes</item>

      <item quantity="other">%d minutes</item>

    </plurals>

    <string name="battery_panel_title" msgid="5931157246673665963">"Utilisation batterie"</string>
@@ -1040,6 +1045,7 @@ 
    <string name="controls_providers_title" msgid="6879775889857085056">"Sélectionnez l\'appli pour laquelle ajouter des commandes"</string>

    <plurals name="controls_number_of_favorites" formatted="false" msgid="1057347832073807380">

      <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> commande ajoutée.</item>

      <item quantity="many"><xliff:g id="NUMBER_1">%s</xliff:g> controls added.</item>

      <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> commandes ajoutées.</item>

    </plurals>

    <string name="controls_removed" msgid="3731789252222856959">"Supprimé"</string>

packages/SystemUI/res/values-mk/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
    <string name="screenshot_saving_title" msgid="2298349784913287333">"Сликата на екранот се зачувува..."</string>

    <string name="screenshot_saved_title" msgid="8893267638659083153">"Сликата од екранот е зачувана"</string>

    <string name="screenshot_saved_text" msgid="7778833104901642442">"Допрете за да ја видите сликата од екранот"</string>

    <string name="screenshot_failed_title" msgid="3259148215671936891">"Не можеше да се зачува слика од екранот"</string>

    <string name="screenshot_failed_title" msgid="3259148215671936891">"Не може да се зачува слика од екранот"</string>

    <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Повторно обидете се да направите слика од екранот"</string>

    <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"Сликата од екранот не може да се зачува поради ограничена меморија"</string>

    <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Апликацијата или вашата организација не дозволува снимање слики од екранот"</string>
@@ -1055,7 +1055,7 @@ 
    <string name="controls_favorite_removed" msgid="5276978408529217272">"Сите контроли се отстранети"</string>

    <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промените не се зачувани"</string>

    <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"Видете други апликации"</string>

    <string name="controls_favorite_load_error" msgid="5126216176144877419">"Контролите не можеше да се вчитаат. Проверете ја апликацијата <xliff:g id="APP">%s</xliff:g> за да се уверите дека поставките за апликацијата не се променети."</string>

    <string name="controls_favorite_load_error" msgid="5126216176144877419">"Контролите не може да се вчитаат. Проверете ја апликацијата <xliff:g id="APP">%s</xliff:g> за да се уверите дека поставките за апликацијата не се променети."</string>

    <string name="controls_favorite_load_none" msgid="7687593026725357775">"Нема компатибилни контроли"</string>

    <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Друга"</string>

    <string name="controls_dialog_title" msgid="2343565267424406202">"Додајте во контроли за уредите"</string>