diff options
author | Adam Cohen <adamcohen@google.com> | 2017-02-17 00:50:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-17 00:50:57 +0000 |
commit | 09f5a96a71d78a95169e1c9060068994695b2183 (patch) | |
tree | 0f3b7f9f1c910e4bfe5ad2f0173e0c096f5cb20e | |
parent | 2f64ffe53e0125e0a188b04dbbee8306bcedf1f6 (diff) | |
parent | 4d8019abf4049a337db09c261ce0a01d0077610d (diff) | |
download | android_packages_apps_Trebuchet-09f5a96a71d78a95169e1c9060068994695b2183.tar.gz android_packages_apps_Trebuchet-09f5a96a71d78a95169e1c9060068994695b2183.tar.bz2 android_packages_apps_Trebuchet-09f5a96a71d78a95169e1c9060068994695b2183.zip |
Merge "Add notification listener back to the manifest" into ub-launcher3-master
-rw-r--r-- | AndroidManifest-common.xml | 8 | ||||
-rw-r--r-- | res/values-v25/bools.xml | 22 | ||||
-rw-r--r-- | res/values-v26/bools.xml | 21 | ||||
-rw-r--r-- | res/values/bools.xml | 21 |
4 files changed, 72 insertions, 0 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index 23ea195cd..86ae73e6e 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -76,6 +76,14 @@ android:process=":wallpaper_chooser"> </service> + <service android:name="com.android.launcher3.notification.NotificationListener" + android:enabled="@bool/notification_badging_enabled" + android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"> + <intent-filter> + <action android:name="android.service.notification.NotificationListenerService" /> + </intent-filter> + </service> + <meta-data android:name="android.nfc.disable_beam_default" android:value="true" /> diff --git a/res/values-v25/bools.xml b/res/values-v25/bools.xml new file mode 100644 index 000000000..6f7ecd91a --- /dev/null +++ b/res/values-v25/bools.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 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. +** 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. +*/ +--> + +<resources> + <!-- TODO(b/35443111): remove from v25 and keep in v26 --> + <bool name="notification_badging_enabled">true</bool> +</resources>
\ No newline at end of file diff --git a/res/values-v26/bools.xml b/res/values-v26/bools.xml new file mode 100644 index 000000000..1093f7844 --- /dev/null +++ b/res/values-v26/bools.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 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. +** 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. +*/ +--> + +<resources> + <bool name="notification_badging_enabled">true</bool> +</resources>
\ No newline at end of file diff --git a/res/values/bools.xml b/res/values/bools.xml new file mode 100644 index 000000000..cc4a7ba44 --- /dev/null +++ b/res/values/bools.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 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. +** 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. +*/ +--> + +<resources> + <bool name="notification_badging_enabled">false</bool> +</resources>
\ No newline at end of file |