diff options
| author | Chet Haase <chet@google.com> | 2013-09-04 16:49:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-04 16:49:39 -0700 |
| commit | 09ed0720288c8d4b97cfd182c630f142077854e9 (patch) | |
| tree | 5e9f746cf931bebabd87a6f125a1309068c32680 /tools/aapt | |
| parent | 465b36d82206facfc0c36079b1b45acd543f8f60 (diff) | |
| parent | 49ee555f239c79871b661e5ff135061f26665e1c (diff) | |
| download | frameworks_base-09ed0720288c8d4b97cfd182c630f142077854e9.zip frameworks_base-09ed0720288c8d4b97cfd182c630f142077854e9.tar.gz frameworks_base-09ed0720288c8d4b97cfd182c630f142077854e9.tar.bz2 | |
am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
Transition API changes from API council recommendations
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Resource.cpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index d617928..08ad7a0 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -172,7 +172,7 @@ private: bool isValidResourceType(const String8& type) { return type == "anim" || type == "animator" || type == "interpolator" - || type == "transition" || type == "scene" + || type == "transition" || type == "drawable" || type == "layout" || type == "values" || type == "xml" || type == "raw" || type == "color" || type == "menu" || type == "mipmap"; @@ -934,7 +934,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) sp<ResourceTypeSet> animators; sp<ResourceTypeSet> interpolators; sp<ResourceTypeSet> transitions; - sp<ResourceTypeSet> scenes; sp<ResourceTypeSet> xmls; sp<ResourceTypeSet> raws; sp<ResourceTypeSet> colors; @@ -947,7 +946,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) ASSIGN_IT(animator); ASSIGN_IT(interpolator); ASSIGN_IT(transition); - ASSIGN_IT(scene); ASSIGN_IT(xml); ASSIGN_IT(raw); ASSIGN_IT(color); @@ -971,7 +969,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) !applyFileOverlay(bundle, assets, &animators, "animator") || !applyFileOverlay(bundle, assets, &interpolators, "interpolator") || !applyFileOverlay(bundle, assets, &transitions, "transition") || - !applyFileOverlay(bundle, assets, &scenes, "scene") || !applyFileOverlay(bundle, assets, &xmls, "xml") || !applyFileOverlay(bundle, assets, &raws, "raw") || !applyFileOverlay(bundle, assets, &colors, "color") || @@ -1038,13 +1035,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) } } - if (scenes != NULL) { - err = makeFileResources(bundle, assets, &table, scenes, "scene"); - if (err != NO_ERROR) { - hasErrors = true; - } - } - if (interpolators != NULL) { err = makeFileResources(bundle, assets, &table, interpolators, "interpolator"); if (err != NO_ERROR) { @@ -1204,21 +1194,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) err = NO_ERROR; } - if (scenes != NULL) { - ResourceDirIterator it(scenes, String8("scene")); - while ((err=it.next()) == NO_ERROR) { - err = compileXmlFile(assets, it.getFile(), &table, xmlFlags); - if (err != NO_ERROR) { - hasErrors = true; - } - } - - if (err < NO_ERROR) { - hasErrors = true; - } - err = NO_ERROR; - } - if (xmls != NULL) { ResourceDirIterator it(xmls, String8("xml")); while ((err=it.next()) == NO_ERROR) { |