diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 13:09:51 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 13:09:51 +0100 |
commit | 1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9 (patch) | |
tree | 07790f46da5b1716448b576ce2b6d81e7a0ddca4 /overlay | |
parent | 076588cc654f9dbbc6e65a291dd85e8e8c096d1e (diff) | |
parent | dee68b3f6e1d78bb8dca56ef3ce64045edce4bfd (diff) | |
download | vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.zip vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.tar.gz vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0
Diffstat (limited to 'overlay')
11 files changed, 33 insertions, 3 deletions
diff --git a/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml b/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml new file mode 100644 index 0000000..3cc1011 --- /dev/null +++ b/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 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_enabledPreinstalledCarrierApps" translatable="false"> + <item>com.cyanogen.ambient.core</item> + <item>com.cyanogen.ambient.updater</item> + <item>com.cyngn.devicemanager</item> + <item>com.cyngn.discovery</item> + </string-array> +</resources>
\ No newline at end of file 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 214ceb9..403890e 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -53,4 +53,10 @@ <item>bugreport</item> <item>users</item> </string-array> + + <!-- Enable lockscreen rotation by default --> + <bool name="config_enableLockScreenRotation">true</bool> + + <!-- Whether to persist the notification for when a usb drive device is plugged in --> + <bool name="config_persistUsbDriveNotification">true</bool> </resources> diff --git a/overlay/common/packages/apps/Settings/res/values/strings.xml b/overlay/common/packages/apps/Settings/res/values/strings.xml index 6a59a0a..93758ea 100644 --- a/overlay/common/packages/apps/Settings/res/values/strings.xml +++ b/overlay/common/packages/apps/Settings/res/values/strings.xml @@ -16,5 +16,8 @@ <resources> <!-- Help URL, Tap & pay [DO NOT TRANSLATE] --> <string name="help_url_nfc_payment" translatable="false">https://support.google.com/wallet/answer/1347934</string> + + <!-- Help URL, Fingerprint [DO NOT TRANSLATE] --> + <string name="help_url_fingerprint" translatable="false">https://support.google.com</string> </resources> diff --git a/overlay/common/packages/services/Telecomm/res/values/cm_config.xml b/overlay/common/packages/services/Telecomm/res/values/cm_config.xml index c208396..958422b 100644 --- a/overlay/common/packages/services/Telecomm/res/values/cm_config.xml +++ b/overlay/common/packages/services/Telecomm/res/values/cm_config.xml @@ -18,12 +18,10 @@ <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] --> <string-array name="incall_default_classes" translatable="false"> <item>com.android.dialer/com.android.incallui.InCallServiceImpl</item> - <item>com.cyngn.dialer/com.android.incallui.InCallServiceImpl</item> </string-array> <!-- Class name for the default main dialer activity [DO NOT TRANSLATE] --> <string-array name="dialer_default_classes" translatable="false"> <item>com.android.dialer/com.android.dialer.DialtactsActivity</item> - <item>com.cyngn.dialer/com.android.dialer.DialtactsActivity</item> </string-array> </resources> diff --git a/overlay/common/packages/services/Telephony/res/values/cm_config.xml b/overlay/common/packages/services/Telephony/res/values/cm_config.xml index 155ed8c..cc13e49 100644 --- a/overlay/common/packages/services/Telephony/res/values/cm_config.xml +++ b/overlay/common/packages/services/Telephony/res/values/cm_config.xml @@ -17,6 +17,5 @@ <resources> <string-array name="dialer_default_classes" translatable="false"> <item>com.android.dialer/com.android.dialer.DialtactsActivity</item> - <item>com.cyngn.dialer/com.android.dialer.DialtactsActivity</item> </string-array> </resources> diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_bg.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_bg.dict Binary files differindex 62a3583..322186b 100644 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_bg.dict +++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_bg.dict diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en_au.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en_au.dict Binary files differindex f06af14..644e7ff 100644 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en_au.dict +++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en_au.dict diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict Binary files differdeleted file mode 100644 index 2b8dce0..0000000 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict +++ /dev/null diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict Binary files differindex 4c76a6d..86c49f5 100644 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict +++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_lb.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_lb.dict Binary files differindex 56fd0cd..99cc408 100644 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_lb.dict +++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_lb.dict diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_uk.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_uk.dict Binary files differindex f38cc41..15715cf 100644 --- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_uk.dict +++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_uk.dict |