From 205548561c67a3c05163d17057a1fc76a338ec15 Mon Sep 17 00:00:00 2001 From: ztenghui Date: Tue, 21 Mar 2017 16:28:57 -0700 Subject: disable versioning for objectAnimator to support path motion bug:33527757 Test: replace the AAPT in local SDK, and make sure the propertyX/YName still works within ObjectAnimator. Change-Id: Ic9bb14cd228dcf7e4d250bd0f6cb5f0c31a14183 --- tools/aapt/ResourceTable.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/aapt/ResourceTable.cpp') diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 60f0d56e09bf..391aa47469ef 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -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; -- cgit v1.2.3-59-g8ed1b