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

Commit 967830eb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5605988 from 0cf1a84f to qt-release 

Change-Id: I03d11a8b45b88fd16d2d6870374017a3a998ffbc
parents 66f84aad 0cf1a84f

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -3241,6 +3241,17 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings" />

        </activity>



        <activity android:name="Settings$GlobalActionsPanelSettingsActivity"

            android:label="@string/global_actions_panel_title">

            <intent-filter>

                <action android:name="com.android.settings.GLOBAL_ACTIONS_PANEL_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

res/drawable/button_border_selected.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <solid

        android:color="@color/notification_importance_selection_bg" />

    <stroke

        android:width="1dp"

        android:width="2dp"

        android:color="@color/notification_importance_button_selected"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>

res/layout/notif_importance_preference.xml

+6 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:focusable="true">

        <ImageView

            android:id="@+id/alert_icon"

            android:src="@drawable/ic_notification_alert"

            android:src="@drawable/ic_notifications"

            android:background="@android:color/transparent"

            android:layout_gravity="center"

            android:layout_width="wrap_content"
@@ -63,7 +63,8 @@ 
            android:ellipsize="end"

            android:maxLines="2"

            android:layout_below="@id/alert_icon"

            android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"

            android:visibility="gone" />

    </RelativeLayout>



    <RelativeLayout
@@ -76,7 +77,7 @@ 
        android:focusable="true">

        <ImageView

            android:id="@+id/silence_icon"

            android:src="@drawable/ic_notification_silence"

            android:src="@drawable/ic_notifications_off_24dp"

            android:background="@android:color/transparent"

            android:layout_gravity="center"

            android:layout_width="wrap_content"
@@ -106,7 +107,8 @@ 
            android:ellipsize="end"

            android:maxLines="2"

            android:layout_below="@id/silence_icon"

            android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"

            android:visibility="gone" />

    </RelativeLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/profile_owner_add.xml

+8 −3
Original line number Diff line number Diff line
@@ -27,12 +27,17 @@ 
              android:layout_height="0dp"

              android:layout_weight="1"

              android:scrollbars = "vertical"

              android:padding="?dialogPreferredPadding"

              android:paddingStart="24dp"

              android:paddingEnd="24dp"

              android:paddingTop="12dp"

              android:paddingBottom="6dp"

              android:gravity="center_vertical"/>



    <TextView android:id="@+id/admin_warning_simplified"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:paddingStart="?dialogPreferredPadding"

              android:paddingEnd="?dialogPreferredPadding"/>

              android:paddingStart="24dp"

              android:paddingEnd="24dp"

              android:paddingTop="6dp"

              android:paddingBottom="12dp"/>

</LinearLayout>

res/values-af/strings.xml

+28 −13
Original line number Diff line number Diff line
@@ -2064,7 +2064,7 @@ 
    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Oudio en teks op skerm"</string>

    <string name="display_category_title" msgid="685461049938269166">"Vertoon"</string>

    <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaksiekontroles"</string>

    <string name="user_installed_services_category_title" msgid="419853083751790648">"Afgelaaide program"</string>

    <string name="user_installed_services_category_title" msgid="6426376488922158647">"Laai dienste af"</string>

    <string name="experimental_category_title" msgid="5272318666666893547">"Eksperimenteel"</string>

    <string name="feature_flags_dashboard_title" msgid="778619522682769966">"Kenmerkvlae"</string>

    <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
@@ -2114,7 +2114,7 @@ 
    <string name="accessibility_notification_vibration_title" msgid="3009997451790678444">"Kennisgewingvibrasie"</string>

    <string name="accessibility_ring_vibration_title" msgid="5369395955680650778">"Luivibrasie"</string>

    <string name="accessibility_touch_vibration_title" msgid="3548641513105226156">"Raakterugvoer"</string>

    <string name="accessibility_service_master_switch_title" msgid="4734268584179937960">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>"</string>

    <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gebruik diens"</string>

    <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gebruik kleurregstelling"</string>

    <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gebruik onderskrifte"</string>

    <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Gaan voort"</string>
@@ -2208,8 +2208,8 @@ 
    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"Volle beheer is gepas vir programme wat jou help met toeganklikheidsbehoeftes, maar nie vir die meeste programme nie."</string>

    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"Bekyk en beheer skerm"</string>

    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"Dit kan alle inhoud op die skerm lees en inhoud bo-oor ander programme vertoon."</string>

    <string name="accessibility_service_action_perform_title" msgid="3591350033271419253">"Bekyk en voer handelinge uit"</string>

    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"Dit kan jou interaksies met \'n program of \'n hardeware-sensor naspoor en namens jou met programme interaksie hê."</string>

    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"Bekyk en voer handelinge uit"</string>

    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"Dit kan jou interaksies met \'n program of \'n hardewaresensor naspoor en namens jou met programme interaksie hê."</string>

    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"Laat toe"</string>

    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"Weier"</string>

    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"Stop"</string>
@@ -3371,6 +3371,22 @@ 
    <string name="notification_pulse_title" msgid="1905382958860387030">"Flikkerende lig"</string>

    <string name="lock_screen_notifications_title" msgid="7604704224172951090">"Sluitskerm"</string>

    <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Wanneer werkprofiel gesluit is"</string>

    <!-- no translation found for lock_screen_notifs_title (3812061224136552712) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_show_all (5848645268278883539) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_show_alerting (3085615237751195449) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_show_none (3357167536259901686) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_redact (3942294440983226225) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_redact_summary (3095153536179931941) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_redact_work (6777821963954035608) -->

    <skip />

    <!-- no translation found for lock_screen_notifs_redact_work_summary (2179290697692276201) -->

    <skip />

    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>

    <string name="lock_screen_notifications_summary_hide" msgid="1133085507139112569">"Wys sensitiewe inhoud net wanneer dit ontsluit is"</string>

    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Moet glad nie kennisgewings wys nie"</string>
@@ -3397,16 +3413,16 @@ 
    <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>

    <string name="notification_importance_high_title" msgid="8792310396497954857">"Spring op skerm"</string>

    <string name="notification_block_title" msgid="1366361048463539674">"Blokkeer"</string>

    <string name="notification_silence_title" msgid="8575600650015431622">"Lig"</string>

    <!-- no translation found for notification_silence_title (6986752165900591125) -->

    <skip />

    <string name="notification_alert_title" msgid="7426286507434650473">"Geprioritiseerd"</string>

    <string name="allow_interruption" msgid="7136150018111848721">"Laat onderbrekings toe"</string>

    <string name="allow_interruption_summary" msgid="7870159391333957050">"Laat die program \'n geluid maak, vibreer en/of kennisgewings op die skerm wys"</string>

    <string name="notification_channel_summary_min" msgid="2965790706738495761">"Vou kennisgewings in na een lyn op die aftrekskerm"</string>

    <string name="notification_channel_summary_low" msgid="7875385321253491191">"Help jou om te fokus met kennisgewings wat net op die aftrekskerm is. Altyd stil."</string>

    <string name="notification_channel_summary_low_status" msgid="7866565328564018007">"Wys prioriteitkennisgewings hieronder. Altyd stil."</string>

    <string name="notification_channel_summary_low_lock" msgid="4009247523075328235">"Wys prioriteitkennisgewings hieronder. Altyd stil."</string>

    <string name="notification_channel_summary_low_status_lock" msgid="3668028634045057230">"Wys prioriteitkennisgewings hieronder. Altyd stil."</string>

    <string name="notification_channel_summary_default" msgid="4618537204284469990">"Trek jou aandag met klank en \'n statusbalk-ikoon. Wys op sluitskerm."</string>

    <!-- no translation found for notification_channel_summary_low (7050068866167282765) -->

    <skip />

    <!-- no translation found for notification_channel_summary_default (5753454293847059695) -->

    <skip />

    <string name="notification_channel_summary_high" msgid="7737315941884569891">"Wys kennisgewings as \'n banier boaan die skerm wanneer die toestel ontsluit is"</string>

    <string name="notification_switch_label" msgid="6843075654538931025">"Wys kennisgewings"</string>

    <string name="default_notification_assistant" msgid="8441022088918117445">"Aanpasbare kennisgewings"</string>
@@ -4133,8 +4149,7 @@ 
    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gekoppel aan veelvuldige toestelle"</string>

    <string name="demo_mode" msgid="2798762752209330277">"Stelsel-UI-demonstrasiemodus"</string>

    <string name="dark_ui_mode" msgid="3888371857083890543">"Donker-tema"</string>

    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (5141126532745008289) -->

    <skip />

    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="5141126532745008289">"Aan / Tydelik gedeaktiveer vanweë Batterybespaarder"</string>

    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4619248181769223081">"Tydelik aangeskakel vanweë Batterybespaarder"</string>

    <string name="dark_ui_settings_dark_summary" msgid="8205234847639399279">"Gesteunde programme sal ook na donker tema toe oorskakel"</string>

    <string name="dark_ui_settings_dialog_acknowledge" msgid="8683868642329596059">"Het dit"</string>
@@ -4185,7 +4200,7 @@ 
    <string name="edge_to_edge_navigation_title" msgid="4889073348091667667">"Gebaarnavigasie"</string>

    <string name="edge_to_edge_navigation_summary" msgid="6353878120627132868">"Swiep op van die onderkant van die skerm af om na die tuisskerm toe te gaan. Swiep van óf die linker- óf die regterrand van die skerm af om terug te gaan. Begin om van die onderkant van die skerm af op te swiep en hou voordat jy los om programme te wissel."</string>

    <string name="legacy_navigation_title" msgid="2635061924638361565">"3-knoppienavigasie"</string>

    <string name="legacy_navigation_summary" msgid="8824432558082404832">"Klassieke Android-navigasiemodus waar die tuisskerm, wisseling tussen programme en om terug te gaan deur knoppies toeganklik is."</string>

    <string name="legacy_navigation_summary" msgid="8824432558082404832">"Klassieke Android-navigasiemodus waar die Tuisskerm, wisseling tussen programme, en om Terug te gaan alles deur knoppies toeganklik is."</string>

    <string name="keywords_system_navigation" msgid="5825645072714635357">"stelselnavigasie, 2-knoppienavigasie, 3-knoppienavigasie, gebaarnavigasie"</string>

    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubbeltik om na foon te kyk"</string>

    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltik om na tablet te kyk"</string>