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

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

Snap for 13120928 from 6191772d to 25Q2-release 

Change-Id: I0b03f8283054b80ff5cf36c3de16a7b81e61c149
parents d35859c0 6191772d

res/values/strings.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -12587,12 +12587,20 @@ 
    <string name="category_name_how_it_works">How it works</string>

    <string name="category_name_how_it_works">How it works</string>

    <!-- Title for satellite connection guide [CHAR_LIMIT=NONE] -->

    <!-- Title for satellite connection guide [CHAR_LIMIT=NONE] -->

    <string name="title_satellite_connection_guide">When you don\u2019t have a mobile network</string>

    <string name="title_satellite_connection_guide">When you don\u2019t have a mobile network</string>

    <!-- Title for satellite connection guide for NTN manual connection type. [CHAR_LIMIT=NONE] -->

    <string name="title_satellite_connection_guide_for_manual_type">Text a phone number</string>

    <!-- Summary for satellite connection guide [CHAR_LIMIT=NONE] -->

    <!-- Summary for satellite connection guide [CHAR_LIMIT=NONE] -->

    <string name="summary_satellite_connection_guide">Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky.</string>

    <string name="summary_satellite_connection_guide">Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky.</string>

    <!-- Summary for satellite connection guide for NTN manual connection type. [CHAR_LIMIT=NONE] -->

    <string name="summary_satellite_connection_guide_for_manual_type">If you don\u2019t have a mobile network, you\u2019ll see an option to use satellite messaging.</string>

    <!-- Title for satellite supported service [CHAR_LIMIT=NONE] -->

    <!-- Title for satellite supported service [CHAR_LIMIT=NONE] -->

    <string name="title_supported_service">After your phone connects to a satellite</string>

    <string name="title_supported_service">After your phone connects to a satellite</string>

    <!-- Title for satellite supported service for NTN manual connection type. [CHAR_LIMIT=NONE] -->

    <string name="title_supported_service_for_manual_type">Follow steps to connect to the satellite</string>

    <!-- Summary for satellite supported service [CHAR_LIMIT=NONE] -->

    <!-- Summary for satellite supported service [CHAR_LIMIT=NONE] -->

    <string name="summary_supported_service">You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available.</string>

    <string name="summary_supported_service">You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available.</string>

    <!-- Summary for satellite supported service for NTN manual connection type. [CHAR_LIMIT=NONE] -->

    <string name="summary_supported_service_for_manual_type">After your phone is connected, you can text anyone, including emergency services.</string>

    <!-- learn more text - more about satellite messaging [CHAR_LIMIT=NONE] -->

    <!-- learn more text - more about satellite messaging [CHAR_LIMIT=NONE] -->

    <string name="satellite_setting_summary_more_information"><xliff:g id="subject" example="satellite messaging">%1$s</xliff:g> may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact <xliff:g id="carrier_name" example="T-Mobile">%2$s</xliff:g> for details.</string>

    <string name="satellite_setting_summary_more_information"><xliff:g id="subject" example="satellite messaging">%1$s</xliff:g> may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact <xliff:g id="carrier_name" example="T-Mobile">%2$s</xliff:g> for details.</string>

    <!-- learn more text - more about satellite messaging without emergency messaging support. [CHAR_LIMIT=NONE] -->

    <!-- learn more text - more about satellite messaging without emergency messaging support. [CHAR_LIMIT=NONE] -->

res/xml/bundle_notifications_settings.xml

+23 −0
Original line number Original line Diff line number Diff line
@@ -56,4 +56,27 @@ 
        android:key="recs"

        android:key="recs"

        android:title="@*android:string/recs_notification_channel_label"

        android:title="@*android:string/recs_notification_channel_label"

        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>

        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>



    <PreferenceCategory

        android:key="notification_bundle_excluded_apps_list"

        android:title="@string/notification_excluded_apps"

        settings:controller="com.android.settings.notification.AdjustmentExcludedAppsPreferenceController">

        <com.android.settingslib.widget.TopIntroPreference

            android:key="excluded_description"

            android:title="@string/notification_bundle_excluded_description"/>



        <!-- apps are added here -->



        <Preference

            android:key="notification_bundle_manage_apps"

            android:order="1000"

            android:icon="@drawable/ic_chevron_right_24dp"

            android:title="@string/notification_summarization_manage_excluded_apps"

            settings:controller="com.android.settings.notification.BundleManageAppsPreferenceController"

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications">

            <extra

                android:name="classname"

                android:value="com.android.settings.Settings$NotificationExcludeClassificationActivity"/>

        </Preference>

    </PreferenceCategory>

</PreferenceScreen>
 
</PreferenceScreen>

res/xml/development_settings.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -114,11 +114,10 @@ 
            android:summary="@string/oem_unlock_enable_summary"

            android:summary="@string/oem_unlock_enable_summary"

            settings:useAdditionalSummary="true" />

            settings:useAdditionalSummary="true" />





        <SwitchPreference

        <SwitchPreferenceCompat

            android:key="enable_16k_pages"

            android:key="enable_16k_pages"

            android:title="@string/enable_16k_pages"

            android:title="@string/enable_16k_pages"

            android:summary="@string/enable_16k_pages_summary"

            android:summary="@string/enable_16k_pages_summary"/>

            settings:useAdditionalSummary="true" />





        <Preference

        <Preference

            android:key="running_apps"

            android:key="running_apps"

res/xml/single_choice_list_item_2.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,8 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:clickable="false" />

        android:clickable="false"

        android:focusable="false"/>





    <LinearLayout

    <LinearLayout

        android:layout_width="0dp"

        android:layout_width="0dp"

res/xml/summarization_notifications_settings.xml

+25 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,29 @@ 
        android:key="global_pref"

        android:key="global_pref"

        android:title="@string/notification_summarization_main_control_title"

        android:title="@string/notification_summarization_main_control_title"

        settings:controller="com.android.settings.notification.SummarizationGlobalPreferenceController" />

        settings:controller="com.android.settings.notification.SummarizationGlobalPreferenceController" />



    <PreferenceCategory

        android:key="notification_summarization_excluded_apps_list"

        android:title="@string/notification_excluded_apps"

        settings:controller="com.android.settings.notification.AdjustmentExcludedAppsPreferenceController">

        <com.android.settingslib.widget.TopIntroPreference

            android:key="excluded_description"

            android:title="@string/notification_summarization_excluded_description"/>



        <!-- apps are added here -->



        <Preference

            android:key="notification_summarization_manage_apps"

            android:order="1000"

            android:icon="@drawable/ic_chevron_right_24dp"

            android:title="@string/notification_summarization_manage_excluded_apps"

            settings:controller="com.android.settings.notification.SummarizationManageAppsPreferenceController"

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications">

            <extra

                android:name="classname"

                android:value="com.android.settings.Settings$NotificationExcludeSummarizationActivity"/>

        </Preference>

    </PreferenceCategory>





</PreferenceScreen>
 
</PreferenceScreen>