diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:24:03 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:24:03 +0100 |
commit | 71a01dce178fb399e914fae82c0c9a9a8de1b120 (patch) | |
tree | e2cb063c06b82bfe22d6f48eb6f8ce2613076237 /overlay/common/vendor | |
parent | d02579012ac823fdbd7b8e185d65c54aef0eea1f (diff) | |
parent | 7f67b4e9402a566b85951a3b21049592e4c070ef (diff) | |
download | vendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.zip vendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.tar.gz vendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.tar.bz2 |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
remove prebuilt terminal (built-in terminal app can be activated in dev settings)
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
CHANGELOG.mkdn
CONTRIBUTORS.mkdn
config/cdma.mk
config/cm_audio.mk
config/common.mk
config/common_full.mk
config/common_full_phone.mk
config/gsm.mk
config/themes_common.mk
get-prebuilts
overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/values/config.xml
overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
prebuilt/common/bootanimation/1080.zip
prebuilt/common/bootanimation/1200.zip
prebuilt/common/bootanimation/240.zip
prebuilt/common/bootanimation/320.zip
prebuilt/common/bootanimation/360.zip
prebuilt/common/bootanimation/480.zip
prebuilt/common/bootanimation/540.zip
prebuilt/common/bootanimation/600.zip
prebuilt/common/bootanimation/720.zip
prebuilt/common/bootanimation/768.zip
prebuilt/common/bootanimation/800.zip
prebuilt/common/etc/apns-conf.xml
sepolicy/mac_permissions.xml
sepolicy/sepolicy.mk
vendorsetup.sh
Change-Id: I4fc2a5b00721cae8b3a36f33c36f006142bad44f
Diffstat (limited to 'overlay/common/vendor')
-rw-r--r-- | overlay/common/vendor/cmsdk/cm/res/res/values/config.xml | 26 | ||||
-rw-r--r-- | overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml | 30 |
2 files changed, 56 insertions, 0 deletions
diff --git a/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml b/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml new file mode 100644 index 0000000..c4d3378 --- /dev/null +++ b/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml @@ -0,0 +1,26 @@ +<?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"> + <!-- Automatic power profile management per app. + Each item should list the fully-qualified activity + name and the power profile id, separated by a comma. --> + <string-array name="config_auto_perf_activities" translatable="false"> + <item>com.aurorasoftworks.quadrant.*BenchmarkExecutionActivity,2</item> + <item>com.antutu.ABenchMark.*,2</item> + <item>.*com.antutu.benchmark.*,2</item> + </string-array> +</resources> diff --git a/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml b/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml new file mode 100644 index 0000000..eec242d --- /dev/null +++ b/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014-2015 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> + <!-- Defaults for System --> + + <!-- Default for CMSettings.System.QS_QUICK_PULLDOWN + 0. Off + 1. Right + 2. Left --> + <integer name="def_qs_quick_pulldown">1</integer> + + <!-- Defaults for Secure --> + + <!-- Default for CMSettings.Secure.STATS_COLLECTION --> + <bool name="def_stats_collection">true</bool> +</resources> |