summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-01-18 19:52:10 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-22 09:30:53 -0800
commitc915fbfbc76eff4b31fbfa06bf45734fb73c104d (patch)
tree8e3876e575f2e0182f81d8364c2b72ae14add807 /libs
parent9e2a8303b4bea8471c95871f97785ce5cabd63e8 (diff)
downloadframeworks_base-c915fbfbc76eff4b31fbfa06bf45734fb73c104d.zip
frameworks_base-c915fbfbc76eff4b31fbfa06bf45734fb73c104d.tar.gz
frameworks_base-c915fbfbc76eff4b31fbfa06bf45734fb73c104d.tar.bz2
Themes: Reference app resource when compiling theme [2/2]
This allows us to pass in the path to the target apk as an additional included resource apk, allowing theme designers to reference styles and attributes from the original package without needing to duplicate them. Duplicating attributes never worked quite well, and causes all sorts of issues, including crashing apps. Instead of a theme declaring attributes, that are app specific, it can simply reference the originals. This way things like colors that are style specific get included correctly. Here's an example of stat_sys_wifi_signal_4_fully.xml using this feature. By using ?com.android.systemui:attr/ we are able to reference attributes defined in SystemUI directly in our themed resource. <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="17.25dp" android:height="18dp" android:viewportWidth="46.0" android:viewportHeight="48.0"> <path android:fillColor="?com.android.systemui:attr/backgroundColor" android:pathData="M20.4,18.0"/> <path android:fillColor="?com.android.systemui:attr/fillColor" android:pathData="M42.0,32.0l0.0,-4.0L26.0,18.0L26.0,7.0c0.0,-1.7 -1.3,-3.0 -3.0, -3.0c-1.7,0.0 -3.0,1.3 -3.0,3.0l0.0,11.0L4.0,28.0l0.0,4.0l16.0,-5.0l0.0,11.0l-4.0, 3.0l0.0,3.0l7.0,-2.0l7.0,2.0l0.0,-3.0l-4.0,-3.0L26.0,27.0L42.0,32.0z"/> </vector> Change-Id: Icc794da9af2cd48099d42f9d7fbadaad8612b5db TICKET: CYNGNOS-1645
Diffstat (limited to 'libs')
-rw-r--r--libs/androidfw/ResourceTypes.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 818e1c5..5fe0d66 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -5290,6 +5290,13 @@ bool ResTable::stringToValue(Res_value* outValue, String16* outString,
identifierForName(name.string(), name.size(),
type.string(), type.size(),
package.string(), package.size(), &specFlags);
+// HACK
+// This allows themes to reference attributes that are app specific and
+// normally private. Only applies to aapt running on device not host
+// build systems.
+#ifdef HAVE_ANDROID_OS
+ enforcePrivate = false;
+#endif
if (rid != 0) {
if (enforcePrivate) {
if ((specFlags&ResTable_typeSpec::SPEC_PUBLIC) == 0) {