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

Commit b6cee106 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by Android (Google) Code Review
Browse files

Merge "disable versioning for objectAnimator to support path motion"

parents a94c5277 20554856

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;