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

Commit 237eb884 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Notification settings, importance and pre-O apps" into oc-dev 

am: 6393e175

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
parents 8485562d 6393e175

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -6579,6 +6579,12 @@ 
    <!-- [CHAR LIMIT=100] Notification Importance: blocked importance level description -->

    <string name="notification_importance_blocked">Never show notifications</string>









    <!-- [CHAR LIMIT=100] Notification Importance template for the channel importance summary -->









    <string name="notification_importance_divider" translatable="false"><xliff:g id="importance_title">%1$s</xliff:g>: <xliff:g id="importance_summary">%2$s</xliff:g></string>

















    <!-- Importance title strings for the Importance page. Also the second part of the importance









     summary on the channel page-->

















    <!-- [CHAR LIMIT=100] Notification Importance: min importance level description -->









    <string name="notification_importance_min">No sound or visual interruption</string>
















@@ -6591,6 +6597,9 @@







    <!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->









    <string name="notification_importance_high">Make sound and pop on screen</string>

















    <!-- Importance title strings for the Importance page. Also the first part of the importance









     summary on the channel page-->

















    <!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->









    <string name="notification_importance_min_title">Low</string>

































res/xml/legacy_channel_notification_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -17,6 +17,12 @@







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









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



















    <!-- Show badge -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="badge"









        android:title="@string/notification_badge_title"









        settings:useAdditionalSummary="true"









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



















    <!-- Importance toggle -->









    <com.android.settingslib.RestrictedSwitchPreference
































res/xml/notification_settings.xml
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2014 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"









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



















</PreferenceScreen>
























res/xml/app_notification_settings.xml→res/xml/upgraded_app_notification_settings.xml



+2
−4






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2014 The Android Open Source Project









<!-- Copyright (C) 2017 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.








@@ -15,9 +15,7 @@







-->



















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









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









        android:title="@string/app_notifications_title"









        android:key="app_notification_settings">









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



















    <!-- Show badge -->









    <com.android.settingslib.RestrictedSwitchPreference