Merge changes from topic "misc" into q10
* changes:
overlay: Remove Trebuchet config
overlay: Remove Keyguard config
vendor: Add messaging app to power whitelist
overlay: Remove config_show4GForLTE
repopick: Support project paths detection on different branches
common: Bring back Android Beam
diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index dd6bb2c..bf27d1d 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -366,6 +366,10 @@
project_path = project_name_to_data[item['project']][item['branch']]
elif args.path:
project_path = args.path
+ elif item['project'] in project_name_to_data and len(project_name_to_data[item['project']]) == 1:
+ local_branch = list(project_name_to_data[item['project']])[0]
+ project_path = project_name_to_data[item['project']][local_branch]
+ print('WARNING: Project {0} has a different branch ("{1}" != "{2}")'.format(project_path, local_branch, item['branch']))
elif args.ignore_missing:
print('WARNING: Skipping {0} since there is no project directory for: {1}\n'.format(item['id'], item['project']))
continue
diff --git a/config/common.mk b/config/common.mk
index 8b23bfc..fe5cb09 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -72,6 +72,10 @@
PRODUCT_COPY_FILES += \
vendor/bliss/prebuilt/common/lib/content-types.properties:$(TARGET_COPY_OUT_SYSTEM)/lib/content-types.properties
+# Enable Android Beam on all targets
+PRODUCT_COPY_FILES += \
+ vendor/bliss/config/permissions/android.software.nfc.beam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.nfc.beam.xml
+
# Enable SIP+VoIP on all targets
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.sip.voip.xml
diff --git a/overlay/common/packages/apps/Trebuchet/res/values/config.xml b/config/permissions/android.software.nfc.beam.xml
similarity index 71%
rename from overlay/common/packages/apps/Trebuchet/res/values/config.xml
rename to config/permissions/android.software.nfc.beam.xml
index ba160ae..c88f8b5 100644
--- a/overlay/common/packages/apps/Trebuchet/res/values/config.xml
+++ b/config/permissions/android.software.nfc.beam.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
+<!-- Copyright (C) 2019 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.
@@ -13,10 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <!-- Enable backups -->
- <bool name="enable_backup">true</bool>
- <string name="backup_api_key">AEdPqrEAAAAIDoOx_2qXwj5RZmKa0fpkv1aqEldrwBp-pnv6Sg</string>
-
-</resources>
+<permissions>
+ <feature name="android.sofware.nfc.beam" />
+</permissions>
diff --git a/config/permissions/lineage-power-whitelist.xml b/config/permissions/lineage-power-whitelist.xml
index 7569a5b..b6545ba 100644
--- a/config/permissions/lineage-power-whitelist.xml
+++ b/config/permissions/lineage-power-whitelist.xml
@@ -16,4 +16,5 @@
<config>
<allow-in-power-save package="com.android.deskclock" />
+ <allow-in-power-save package="com.android.messaging" />
</config>
diff --git a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
deleted file mode 100644
index 1e69bda..0000000
--- a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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">
- <!-- default to disabling the menu key. The Lineage setting to
- do this is a no-op unless the below item is true -->
- <bool name="config_disableMenuKeyInLockScreen">true</bool>
-
- <!-- config for showing AM/PM on lock screen in 12hour format -->
- <bool name="config_showAmpm">false</bool>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index 6b8f590..95e8df8 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -22,9 +22,6 @@
from UMTS data icon on devices -->
<bool name="config_hspa_data_distinguishable">true</bool>
- <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
- <bool name="config_show4GForLTE">false</bool>
-
<bool name="quick_settings_show_full_alarm">true</bool>
<!-- If true, enable the advance anti-falsing classifier on the lockscreen. On some devices it