diff options
author | Julia Reynolds <juliacr@google.com> | 2017-05-09 10:15:51 -0400 |
---|---|---|
committer | Julia Reynolds <juliacr@google.com> | 2017-05-11 14:48:17 -0400 |
commit | 2f0547c783f3a7556e8a34598b41d85478c8c589 (patch) | |
tree | 5c495b3ac4c398d4474d9cc528386cab258d1244 /res/xml/notification_settings.xml | |
parent | f1730bee90c2f6d1c1a379b3e2153e3847af5e76 (diff) | |
download | packages_apps_Settings-2f0547c783f3a7556e8a34598b41d85478c8c589.tar.gz packages_apps_Settings-2f0547c783f3a7556e8a34598b41d85478c8c589.tar.bz2 packages_apps_Settings-2f0547c783f3a7556e8a34598b41d85478c8c589.zip |
Notification settings, importance and pre-O apps
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes: 38177887
Bug: 38120923
Fixes: 38012300
Fixes: 37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
Diffstat (limited to 'res/xml/notification_settings.xml')
-rw-r--r-- | res/xml/notification_settings.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml new file mode 100644 index 0000000000..b2f1d3d559 --- /dev/null +++ b/res/xml/notification_settings.xml @@ -0,0 +1,20 @@ +<?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> |