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

Commit ccd2bfc1 authored by Chloris Kuo's avatar Chloris Kuo Committed by Android (Google) Code Review
Browse files

Merge "NAS Setting Migration" into sc-dev

parents 588e4e8d 2c955bba

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.notification.NotificationAssistantPicker" />

                       android:value="com.android.settings.notification.ConfigureNotificationSettings" />

        </activity>



        <activity

res/values/strings.xml

+9 −6
Original line number Diff line number Diff line
@@ -9032,8 +9032,10 @@ 
        <item quantity="other">%d apps can read notifications</item>

    </plurals>









    <!-- Title for Notification Assistant Picker screen [CHAR LIMIT=30]-->









    <string name="notification_assistant_title">Adaptive Notifications</string>









    <!-- Title for Notification Assistant setting  [CHAR LIMIT=30]-->









    <string name="notification_assistant_title">Enhanced notifications</string>









    <!-- Summary of Notification Assistant provided features [CHAR LIMIT=NONE]-->









    <string name="notification_assistant_summary">Get suggested actions, replies, and more</string>

















    <!-- Label for no NotificationAssistantService [CHAR_LIMIT=NONE] -->









    <string name="no_notification_assistant">None</string>








@@ -9051,10 +9053,11 @@







    <!-- Summary for a warning message about security implications of enabling a notification









          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->









    <string name="notification_assistant_security_warning_summary">









        <xliff:g id="notification_assistant_name" example="Notification Assistant">%1$s</xliff:g> will be able to read all notifications,









        including personal information such as contact names and the text of messages you receive.









        This app will also be able to dismiss notifications or take action on buttons in notifications, including answering phone calls.









        \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings.









        Enhanced notifications can read all notification content,









        including personal information like contact names and messages.









        This feature can also dismiss notifications or take actions on buttons in notifications,









        such as answering phone calls.









        \n\nThis feature can also turn Priority mode on or off and change related settings.









    </string>

















    <!-- Title for a warning message about security implications of enabling a notification

























res/xml/configure_notification_settings.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -115,6 +115,11 @@







            android:title="@string/snooze_options_title"









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



















        <SwitchPreference









            android:key="notification_assistant"









            android:title="@string/notification_assistant_title"









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



















        <!-- Notification badging -->









        <SwitchPreference









            android:key="notification_badging"
































res/xml/configure_notification_settings_v2.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -155,5 +155,11 @@







            android:order="22"









            android:title="@string/notification_pulse_title"









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



















        <SwitchPreference









            android:key="notification_assistant"









            android:order="23"









            android:title="@string/notification_assistant_title"









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









    </PreferenceCategory>









</PreferenceScreen>
























res/xml/special_access.xml



+0
−7






























Original line number
Diff line number
Diff line







@@ -80,13 +80,6 @@







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









    </Preference>



















    <com.android.settingslib.widget.AppPreference









        android:key="notification_assistant"









        android:title="@string/notification_assistant_title"









        android:summary="@string/summary_placeholder"









        settings:fragment="com.android.settings.notification.NotificationAssistantPicker"









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



















    <Preference









        android:key="notification_access"









        android:title="@string/manage_notification_access_title"