summaryrefslogtreecommitdiffstats
path: root/overlay
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 19:41:06 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 19:41:06 +0100
commit64dba5e9e248b0f662360dd4d2abd604f5d95048 (patch)
treeaacd35f6db2a768e6ba5316004fed02a16c4f1db /overlay
parent62d7769c27c907845f4066952637fc9732de40fc (diff)
parentdee66450bb214aa7afa174f176c88a09df86d5ba (diff)
downloadvendor_replicant-64dba5e9e248b0f662360dd4d2abd604f5d95048.zip
vendor_replicant-64dba5e9e248b0f662360dd4d2abd604f5d95048.tar.gz
vendor_replicant-64dba5e9e248b0f662360dd4d2abd604f5d95048.tar.bz2
Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'overlay')
-rw-r--r--overlay/common/frameworks/base/core/res/res/values/config.xml3
-rw-r--r--overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml21
-rw-r--r--overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml2
3 files changed, 23 insertions, 3 deletions
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 403890e..cdbfec2 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
+ (C) 2017 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -41,7 +42,7 @@
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
</string-array>
- <string name="config_mms_user_agent">CyanogenMod</string>
+ <string name="config_mms_user_agent">LineageOS</string>
<string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
<!-- Defines the default set of global actions. Actions may still be disabled or hidden based
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
new file mode 100644
index 0000000..1317274
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2009, 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="def_enable_mobile_data">false</bool>
+</resources>
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 6ef0266..4514a53 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,6 +18,4 @@
-->
<resources>
<string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
- <!-- Enable notification counters in statusbar -->
- <integer name="def_notif_count">1</integer>
</resources>