Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disable versioning for objectAnimator to support path motion"

Browse Source
This commit is contained in:
Tenghui Zhu
2017-03-22 17:34:25 +00:00
committed by Android (Google) Code Review
parent a94c527736 205548561c
commit b6cee106ed
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/ResourceTable.cpp
View File

@@ -4765,6 +4765,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
const String16 vector16("vector");
const String16 animatedVector16("animated-vector");
const String16 pathInterpolator16("pathInterpolator");
const String16 objectAnimator16("objectAnimator");
const int minSdk = getMinSdkVersion(bundle);
if (minSdk >= SDK_LOLLIPOP_MR1) {
@@ -4791,6 +4792,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 ||
node->getElementName() == animatedVector16 ||
node->getElementName() == objectAnimator16 ||
node->getElementName() == pathInterpolator16)) {
// We were told not to version vector tags, so skip the children here.
continue;