ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Merge "overlay: Fix Keyguard configuration" into cm-11.0

Browse Source
This commit is contained in:
Danny Baumann 2013-12-15 11:34:13 +00:00 committed by Gerrit Code Review
commit 29000c52e9
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
overlay/common/frameworks/base/core/res/res/values/config.xml
View File

@ -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>

27
overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml Normal file
View File

@ -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>