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

Commit 300b3742 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf70

Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
parents a3368c72 7440bf70
Loading
Loading
Loading
Loading
+23 −3
Original line number Diff line number Diff line
@@ -6908,6 +6908,7 @@
    <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
    <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string>
    <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
    <string name="user_cannot_manage_message" product="tablet">Only the tablet\u2019s owner can manage users.</string>
    <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
@@ -8973,8 +8974,22 @@
    <string name="zen_mode_bypassing_apps">Allow apps to override</string>
    <!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND header -->
    <string name="zen_mode_bypassing_apps_header">Apps that can interrupt</string>
    <!-- [CHAR LIMIT=100] Zen mode settings: Add apps to bypass DND header -->
    <string name="zen_mode_bypassing_apps_add_header">Select more apps</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: No apps are bypassing DND -->
    <string name="zen_mode_bypassing_apps_none">No apps selected</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: No apps are bypassing DND -->
    <string name="zen_mode_bypassing_apps_subtext_none">No apps can interrupt</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: Preference to add apps that are allowed to bypass DND -->
    <string name="zen_mode_bypassing_apps_add">Add apps</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: Summary indicating all notification channels can
    bypass DND for this app -->
    <string name="zen_mode_bypassing_apps_summary_all">All notifications</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: Summary indicating all notification channels can
    bypass DND for this app -->
    <string name="zen_mode_bypassing_apps_summary_some">Some notifications</string>
    <!-- [CHAR LIMIT=NONE] Zen mode settings: Footer for DND bypassing apps settings -->
    <string name="zen_mode_bypassing_apps_footer">Selected people can still reach you, even if you don\u2019t allow apps to interrupt</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: Allow apps to bypass DND -->
    <plurals name="zen_mode_bypassing_apps_subtext">
        <item quantity="one"><xliff:g id="app_name" example="Nest">%s</xliff:g> can interrupt</item>
@@ -8989,6 +9004,11 @@
    <string name="zen_mode_bypassing_apps_all_summary">All notifications</string>
    <!-- [CHAR LIMIT=100] Zen mode settings: App that can bypass DND's secondary text describing which notification channels from the app can bypass DND-->
    <string name="zen_mode_bypassing_apps_some_summary">Some notifications</string>
    <!-- [CHAR LIMIT=100] Zen mode settings: Allow notifications from an app to bypass DND header -->
    <string name="zen_mode_bypassing_app_channels_header">Notifications that can interrupt</string>
    <!-- [CHAR LIMIT=100] Zen mode settings: Allow all notifications from an app to bypass DND
    toggle title -->
    <string name="zen_mode_bypassing_app_channels_toggle_all">Allow all notifications</string>
    <!-- [CHAR LIMIT=120] Zen mode settings: Summary for sound interruption settings -->
    <plurals name="zen_mode_other_sounds_summary">
@@ -9022,9 +9042,9 @@
    <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers (ie: repeat callers are allowed to bypass dnd) -->
    <string name="zen_mode_repeat_callers_list">repeat callers</string>
    <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
    <string name="zen_mode_calls_summary_one">Allow from <xliff:g id="caller type" example="contacts">%1$s</xliff:g></string>
    <string name="zen_mode_calls_summary_one"><xliff:g id="caller type" example="contacts">%1$s</xliff:g></string>
    <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
    <string name="zen_mode_calls_summary_two">Allow from <xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="callert tpye" example="repeat callers">%2$s</xliff:g></string>
    <string name="zen_mode_calls_summary_two"><xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="caller type" example="repeat callers">%2$s</xliff:g></string>
    <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period</string>
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2020 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/zen_mode_settings_title">
    <com.android.settingslib.widget.LayoutPreference
        android:key="pref_app_header"
        android:layout="@layout/settings_entity_header" />

    <PreferenceCategory
        android:key="zen_mode_bypassing_app_channels_list"
        android:title="@string/zen_mode_bypassing_app_channels_header">
        <!-- add app channel toggles here -->
    </PreferenceCategory>
</PreferenceScreen>
 No newline at end of file
+5 −4
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@
     limitations under the License.
-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="conversation_list"
        android:title="zen_mode_conversations_title">
    android:title="@string/zen_mode_conversations_title">

    <PreferenceCategory
        android:key="important_conversations"
+18 −1
Original line number Diff line number Diff line
@@ -17,4 +17,21 @@

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/zen_mode_bypassing_apps_title" />
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/zen_mode_bypassing_apps_title">

    <PreferenceCategory
        android:key="zen_mode_bypassing_apps_list"
        android:title="@string/zen_mode_bypassing_apps_header">
        <!-- apps that have notifications that can bypass DND are added here -->
    </PreferenceCategory>

    <Preference
        android:key="zen_mode_bypassing_apps_add"
        android:title="@string/zen_mode_bypassing_apps_add"
        android:icon="@drawable/ic_add_24dp"
        settings:allowDividerAbove="true" />

    <com.android.settingslib.widget.FooterPreference
        android:title="@string/zen_mode_bypassing_apps_footer" />
</PreferenceScreen>
+45 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2020 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:key="zen_mode_custom_rule_calls_settings_page"
    android:title="@string/zen_mode_calls_title" >

    <PreferenceCategory
        android:key="zen_mode_settings_category_calls"
        android:title="@string/zen_mode_settings_category">
        <!-- Calls -->
        <ListPreference
            android:key="zen_mode_calls"
            android:title="@string/zen_mode_calls"
            android:entries="@array/zen_mode_contacts_calls_entries"
            android:entryValues="@array/zen_mode_contacts_values"/>

        <Preference
            android:key="zen_mode_starred_contacts_callers"
            android:title="@string/zen_mode_starred_contacts_title"/>

        <!-- Repeat callers -->
        <SwitchPreference
            android:key="zen_mode_repeat_callers"
            android:title="@string/zen_mode_repeat_callers_title" />
    </PreferenceCategory>

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

</PreferenceScreen>
Loading