diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-04-24 19:19:30 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-05-04 16:43:24 -0700 |
| commit | 24aad163bc88cb10d2275385e9afc3de7f342d65 (patch) | |
| tree | 361fc0b3fbef5f68a16f357ae9d2bed5e93efbf5 /tools/aapt2/Linker_test.cpp | |
| parent | ab2581398c812917145088590bd18eb83f3a2ea6 (diff) | |
| download | frameworks_base-24aad163bc88cb10d2275385e9afc3de7f342d65.zip frameworks_base-24aad163bc88cb10d2275385e9afc3de7f342d65.tar.gz frameworks_base-24aad163bc88cb10d2275385e9afc3de7f342d65.tar.bz2 | |
Add namespace handling in attribute values
Previously, you could only reference namespace prefixes in attribute names:
<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
appcompat:name="hey"
...
Now you can also reference them in resource names within an attribute value:
...
android:text="@appcompat:string/confirm"
...
Which will be treated as "@android.support.v7.appcompat:string/confirm".
Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
Diffstat (limited to 'tools/aapt2/Linker_test.cpp')
| -rw-r--r-- | tools/aapt2/Linker_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/Linker_test.cpp b/tools/aapt2/Linker_test.cpp index 4d2d360..3c5b8b4 100644 --- a/tools/aapt2/Linker_test.cpp +++ b/tools/aapt2/Linker_test.cpp @@ -15,8 +15,8 @@ */ #include "Linker.h" -#include "Resolver.h" #include "ResourceTable.h" +#include "ResourceTableResolver.h" #include "ResourceValues.h" #include "Util.h" @@ -31,7 +31,7 @@ struct LinkerTest : public ::testing::Test { mTable = std::make_shared<ResourceTable>(); mTable->setPackage(u"android"); mTable->setPackageId(0x01); - mLinker = std::make_shared<Linker>(mTable, std::make_shared<Resolver>( + mLinker = std::make_shared<Linker>(mTable, std::make_shared<ResourceTableResolver>( mTable, std::make_shared<android::AssetManager>())); // Create a few attributes for use in the tests. |