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

Commit 30ebbb0d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Polish updates for settings" into main

parents 117a3601 cd2db34d

res/values/strings.xml

+9 −2
Original line number Diff line number Diff line
@@ -9081,6 +9081,14 @@ Data usage charges may apply.</string> 








    <!-- App Info > Notifications: Title for section where notifications bundles can be configured [CHAR LIMIT=80]-->









    <string name="notification_bundles">Notification organizer</string>









    <!-- [CHAR LIMIT=100] Notification bundle type summary: promotions -->









    <string name="notification_bundle_promotions_summary">Sales, new features, and more</string>









    <!-- [CHAR LIMIT=100] Notification bundle type summary: news -->









    <string name="notification_bundle_news_summary">Top stories, editorials, and more</string>









    <!-- [CHAR LIMIT=100] Notification bundle type summary: social -->









    <string name="notification_bundle_social_summary">Likes, posts, and more</string>









    <!-- [CHAR LIMIT=100] Notification bundle type summary: content recommendations -->









    <string name="notification_bundle_recs_summary">Newsletters, recommended media, and more</string>

























    <!-- App Info > Notifications: Title for section where notifications AI features can be configured [CHAR LIMIT=80]-->








@@ -9094,7 +9102,7 @@ Data usage charges may apply.</string>







    <string name="notification_summarization_excluded_description">Notifications from these apps will not be summarized</string>









    <string name="notification_summarization_manage_excluded_apps">Manage apps</string>









    <string name="notification_summarization_manage_excluded_apps_title">Allow notification summaries for apps</string>









    <string name="notification_excluded_apps">App exceptions</string>









    <string name="notification_excluded_apps">Don\'t include these apps</string>









    <string name="notification_app_level_summarize_title">Summarize notifications</string>









    <string name="notification_app_level_summarize_subtext">Summarize conversation notifications from this app</string>
















@@ -9520,7 +9528,6 @@ Data usage charges may apply.</string>















    <string name="notification_app_level_bundle_title">Bundle notifications</string>









    <string name="notification_app_level_bundle_subtext">Notifications with similar themes will be silenced and grouped together for a quieter experience</string>









    <string name="notification_bundle_excluded_description">Notifications from these apps won\’t be bundled</string>









    <string name="notification_bundle_manage_excluded_apps_title">Allow notification bundling for apps</string>

















    <!-- Label for switch enabling notification adjustments (notification organizer, summaries) for work profile -->

























res/xml/bundle_notifications_settings.xml



+13
−12






























Original line number
Diff line number
Diff line







@@ -20,6 +20,11 @@







    xmlns:app="http://schemas.android.com/apk/res-auto"









    android:title="@string/notification_bundle_title">



















    <com.android.settingslib.widget.TopIntroPreference









        android:key="feature_description"









        settings:searchable="false"









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



















    <com.android.settingslib.widget.IllustrationPreference









        android:key="illustration"









        settings:searchable="false"








@@ -27,11 +32,6 @@







        app:lottie_cacheComposition="false"









        settings:dynamicColor="true"/>



















    <com.android.settingslib.widget.TopIntroPreference









        android:key="feature_description"









        settings:searchable="false"









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



















    <PreferenceCategory









        android:key="enabled_settings">


















@@ -44,19 +44,23 @@

















            <CheckBoxPreference









                  android:key="promotions"









                  android:title="@*android:string/promotional_notification_channel_label"/>









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









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



















            <CheckBoxPreference









                android:key="news"









                android:title="@*android:string/news_notification_channel_label"/>









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









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



















            <CheckBoxPreference









                android:key="social"









                android:title="@*android:string/social_notification_channel_label"/>









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









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



















            <CheckBoxPreference









                android:key="recs"









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









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









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









        </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



















        <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>








@@ -71,9 +75,6 @@







        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 -->










































res/xml/summarization_notifications_settings.xml



+5
−8






























Original line number
Diff line number
Diff line







@@ -20,6 +20,11 @@







    xmlns:app="http://schemas.android.com/apk/res-auto"









    android:title="@string/notification_summarization_title">



















    <com.android.settingslib.widget.TopIntroPreference









        android:key="feature_description"









        settings:searchable="false"









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



















    <com.android.settingslib.widget.IllustrationPreference









        android:key="illustration"









        settings:searchable="false"








@@ -27,11 +32,6 @@







        app:lottie_cacheComposition="false"









        settings:dynamicColor="true"/>



















    <com.android.settingslib.widget.TopIntroPreference









        android:key="feature_description"









        settings:searchable="false"









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



















    <PreferenceCategory









        android:key="enabled_settings">


















@@ -49,9 +49,6 @@







        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 -->