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

Commit 07c2cdee authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Notification settings updates"

parents 54e304b8 4f3b5563

AndroidManifest.xml

+0 −13
Original line number Diff line number Diff line
@@ -2645,19 +2645,6 @@ 
                android:value="com.android.settings.notification.SoundSettings" />

        </activity-alias>



        <!-- Show apps for which application-level notification settings are applicable -->

        <activity android:name="Settings$NotificationAppListActivity"

                android:label="@string/app_notifications_title"

                android:icon="@drawable/ic_notifications"

                android:exported="true"

                android:taskAffinity="">

            <intent-filter android:priority="150">

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

            </intent-filter>

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

                android:value="com.android.settings.applications.NotificationApps" />

        </activity>



        <!-- Show application-level notification settings (app passed in as extras) -->

        <activity android:name="Settings$AppNotificationSettingsActivity"

                android:exported="true">

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -6983,6 +6983,9 @@ 
    <!-- notification header - apps that have recently sent notifications -->

    <string name="recent_notifications">Recently sent</string>









    <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->









    <string name="recent_notifications_see_all_title">See all apps</string>

















    <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->









    <string name="advanced_section_header">Advanced</string>

































res/xml/app_notification_settings.xml



+10
−9






























Original line number
Diff line number
Diff line







@@ -15,7 +15,8 @@







-->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









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









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









        settings:initialExpandedChildrenCount="500">



















    <com.android.settings.applications.LayoutPreference









        android:key="pref_app_header"








@@ -25,24 +26,24 @@







        android:key="block"









        android:layout="@layout/styled_switch_bar" />



















    <com.android.settings.notification.NotificationFooterPreference









        android:key="block_desc" />



















    <!-- Channels/Channel groups added here -->



















    <!-- Show badge -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="badge"









        android:title="@string/notification_badge_title"









        android:order="501"









        settings:useAdditionalSummary="true"









        settings:allowDividerAbove="true"









        settings:restrictedSwitchSummary="@string/enabled_by_admin" />



















    <!-- Channels/Channel groups added here -->



















    <Preference









        android:key="app_link"









        android:title="@string/app_settings_link"









        android:order="500"









        settings:allowDividerAbove="true"/>



















    <com.android.settings.notification.NotificationFooterPreference









        android:key="block_desc"









        android:order="1000" />









        android:order="502" />



















    <com.android.settings.notification.NotificationFooterPreference









        android:key="desc"
































res/xml/channel_notification_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -27,7 +27,7 @@







        android:layout="@layout/styled_switch_bar" />



















    <!-- Importance -->









    <Preference









    <com.android.settings.RestrictedListPreference









        android:key="importance"









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










































res/xml/configure_notification_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -79,7 +79,7 @@







            <intent









                android:action="android.intent.action.MAIN"









                android:targetPackage="com.android.settings"









                android:targetClass="com.android.settings.Settings$NotificationAppListActivity">









                android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">









            </intent>









        </Preference>









    </PreferenceCategory>