drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable versioning for objectAnimator to support path motion

Browse Source 
bug:33527757

Test: replace the AAPT in local SDK, and make sure the propertyX/YName
still works within ObjectAnimator.

Change-Id: Ic9bb14cd228dcf7e4d250bd0f6cb5f0c31a14183
This commit is contained in:
ztenghui
2017-03-21 16:28:57 -07:00
parent 5beefa697a
commit 205548561c
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 vector16("vector");
const String16 animatedVector16("animated-vector"); const String16 animatedVector16("animated-vector");
const String16 pathInterpolator16("pathInterpolator"); const String16 pathInterpolator16("pathInterpolator");
const String16 objectAnimator16("objectAnimator");
const int minSdk = getMinSdkVersion(bundle); const int minSdk = getMinSdkVersion(bundle);
if (minSdk >= SDK_LOLLIPOP_MR1) { if (minSdk >= SDK_LOLLIPOP_MR1) {
@ -4791,6 +4792,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 || if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 ||
node->getElementName() == animatedVector16 || node->getElementName() == animatedVector16 ||
node->getElementName() == objectAnimator16 ||
node->getElementName() == pathInterpolator16)) { node->getElementName() == pathInterpolator16)) {
// We were told not to version vector tags, so skip the children here. // We were told not to version vector tags, so skip the children here.
continue; continue;