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

Commit fa1d67a6 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by android-build-merger
Browse files

Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev 

am: 81831f89

Change-Id: I0ee4801c31a63b8e617adb053a773456814b65ff
parents b08aa082 81831f89

tools/aapt/ResourceTable.cpp

+3 −1
Original line number Diff line number Diff line
@@ -4847,6 +4847,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 
    const String16 animatedVector16("animated-vector");

    const String16 pathInterpolator16("pathInterpolator");

    const String16 objectAnimator16("objectAnimator");

    const String16 gradient16("gradient");



    const int minSdk = getMinSdkVersion(bundle);

    if (minSdk >= SDK_LOLLIPOP_MR1) {
@@ -4874,7 +4875,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 
        if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 ||

                    node->getElementName() == animatedVector16 ||

                    node->getElementName() == objectAnimator16 ||

                    node->getElementName() == pathInterpolator16)) {

                    node->getElementName() == pathInterpolator16 ||

                    node->getElementName() == gradient16)) {

            // We were told not to version vector tags, so skip the children here.

            continue;

        }

tools/aapt2/cmd/Link.cpp

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static bool IsTransitionElement(const std::string& name) { 


static bool IsVectorElement(const std::string& name) {

  return name == "vector" || name == "animated-vector" || name == "pathInterpolator" ||

         name == "objectAnimator";

         name == "objectAnimator" || name == "gradient";

}



template <typename T>