summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-04-10 23:31:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-10 23:31:42 +0000
commit7fc94d7aacddb12e6d50401314fdc029d20939a6 (patch)
tree8ede34755a110eafd2b5c7f01f4b2c27b14c8b42 /res
parent70197166206a3b075eb4e901ce2aab78d887bb34 (diff)
parentcd4cc97f6f761b8cc377821a2214432a376dd4f8 (diff)
downloadandroid_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.tar.gz
android_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.tar.bz2
android_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.zip
Merge "Disable notification listener on pre-26" into ub-launcher3-dorval
am: cd4cc97f6f Change-Id: I6e1a2de2ece9308f057e6cdea1a3a50b2dd32962
Diffstat (limited to 'res')
-rw-r--r--res/values-v25/bools.xml22
1 files changed, 0 insertions, 22 deletions
diff --git a/res/values-v25/bools.xml b/res/values-v25/bools.xml
deleted file mode 100644
index 6f7ecd91a..000000000
--- a/res/values-v25/bools.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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