Merge "vendor: support custom unofficial build tags" into cm-11.0
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 02ac6ab..126d435 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- default to disabling the menu key. The CM setting to
- do this is a no-op unless the below item is true -->
- <bool name="config_disableMenuKeyInLockScreen">true</bool>
+<!--
+ Copyright (C) 2013 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="config_locationProviderPackageNames" translatable="false">
<!-- The Google provider -->
<item>com.google.android.gms</item>
@@ -11,12 +22,6 @@
<item>com.android.location.fused</item>
</string-array>
- <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] -->
- <string name="widget_default_package_name">com.cyanogenmod.lockclock</string>
-
- <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] -->
- <string name="widget_default_class_name">com.cyanogenmod.lockclock.ClockWidgetProvider</string>
-
<bool name="config_cellBroadcastAppLinks">true</bool>
<!-- Disable stock OTA components if installed -->
@@ -26,4 +31,3 @@
<item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$Receiver</item>
</string-array>
</resources>
-
diff --git a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
new file mode 100644
index 0000000..b07d685
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] -->
+ <string name="widget_default_package_name">com.cyanogenmod.lockclock</string>
+
+ <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] -->
+ <string name="widget_default_class_name">com.cyanogenmod.lockclock.ClockWidgetProvider</string>
+
+ <!-- default to disabling the menu key. The CM setting to
+ do this is a no-op unless the below item is true -->
+ <bool name="config_disableMenuKeyInLockScreen">true</bool>
+</resources>