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

Commit 3921f974 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create settings screen for Notification Assistant"

parents 6b12d799 01b2a635
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -2327,6 +2327,18 @@
                       android:value="com.android.settings.notification.NotificationAccessSettings" />
        </activity>

        <activity
            android:name="Settings$NotificationAssistantSettingsActivity"
            android:label="@string/notification_assistant_title"
            android:parentActivityName="Settings">
            <intent-filter android:priority="1">
                <action android:name="android.settings.NOTIFICATION_ASSISTANT_SETTINGS" />
                <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" />
        </activity>

        <activity
            android:name="Settings$VrListenersSettingsActivity"
            android:label="@string/vr_listeners_title"
+19 −0
Original line number Diff line number Diff line
@@ -7796,9 +7796,28 @@
        <item quantity="other">%d apps can read notifications</item>
    </plurals>
    <!-- Title for Notification Assistant Picker screen [CHAR LIMIT=30]-->
    <string name="notification_assistant_title">Notification Assistant</string>
    <!-- Label for no NotificationAssistantService [CHAR_LIMIT=NONE] -->
    <string name="no_notification_assistant">No assistant</string>
    <!-- String to show in the list of notification listeners, when none is installed -->
    <string name="no_notification_listeners">No installed apps have requested notification access.</string>
    <!-- Title for a warning message about security implications of enabling a notification
      assistant, displayed as a dialog message. [CHAR LIMIT=NONE] -->
    <string name="notification_assistant_security_warning_title">Allow notification access for
         <xliff:g id="service" example="NotificationAssistant">%1$s</xliff:g>?</string>
    <!-- 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.
        It will also be able to modify or dismiss notifications or trigger action buttons they contain.
        \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings.
    </string>
    <!-- Title for a warning message about security implications of enabling a notification
          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
    <string name="notification_listener_security_warning_title">Allow notification access for
+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@
                  android:title="@string/configure_notification_settings"
                  android:key="configure_notification_settings">

    <com.android.settingslib.widget.apppreference.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"/>

    <SwitchPreference
        android:key="hide_silent_icons"
        android:title="@string/hide_silent_icons_title"
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2019 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/notification_assistant_title" />
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ public class Settings extends SettingsActivity {
    public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
    public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
    public static class NotificationAssistantSettingsActivity extends SettingsActivity{ /* empty */ }
    public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
    public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ }
Loading