Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20554856 authored by ztenghui's avatar ztenghui
Browse files

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
parent 5beefa69

tools/aapt/ResourceTable.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;