Merge remote-tracking branch 'PA/kitkat' into kitkat
Conflicts:
main.mk
diff --git a/configs/permissions/com.tmobile.software.themes.xml b/configs/permissions/com.tmobile.software.themes.xml
new file mode 100644
index 0000000..f1c2f54
--- /dev/null
+++ b/configs/permissions/com.tmobile.software.themes.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<permissions>
+ <feature name="com.tmobile.software.themes" />
+</permissions>
+
diff --git a/configs/permissions/org.cyanogenmod.theme.xml b/configs/permissions/org.cyanogenmod.theme.xml
new file mode 100644
index 0000000..a26a04c
--- /dev/null
+++ b/configs/permissions/org.cyanogenmod.theme.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<permissions>
+ <feature name="org.cyanogenmod.theme" />
+</permissions>
diff --git a/configs/themes_common.mk b/configs/themes_common.mk
new file mode 100644
index 0000000..1fe45bc
--- /dev/null
+++ b/configs/themes_common.mk
@@ -0,0 +1,8 @@
+# Theme engine
+PRODUCT_PACKAGES += \
+ ThemeChooser \
+ ThemesProvider
+
+PRODUCT_COPY_FILES += \
+ vendor/pa/configs/permissions/com.tmobile.software.themes.xml:system/etc/permissions/com.tmobile.software.themes.xml \
+ vendor/pa/configs/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml
diff --git a/main.mk b/main.mk
index 986f374..189faf9 100644
--- a/main.mk
+++ b/main.mk
@@ -20,6 +20,10 @@
include vendor/pa/configs/pa_overrides.mk
include vendor/pa/configs/bootanimation.mk
include vendor/pa/configs/version.mk
+include vendor/pa/configs/themes_common.mk
+
+
+# Include PSD vendor
include vendor/psd/main.mk
diff --git a/vendor.mk b/vendor.mk
index e6b57cc..131c1b8 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -3,6 +3,6 @@
# Version info
ROM_VERSION_MAJOR := 4
-ROM_VERSION_MINOR := 3
+ROM_VERSION_MINOR := 4
ROM_VERSION_MAINTENANCE :=
-ROM_VERSION_TAG := BETA7
+ROM_VERSION_TAG := BETA1