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

Commit 0ac5791e authored by Nick Butcher's avatar Nick Butcher Committed by android-build-merger
Browse files

Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev 

am: 35e14105

Change-Id: If9f28bfe12d75fca6b8f07c15b77f78267ef6292
parents ca8b6fdf 35e14105

tools/aapt/ResourceTable.cpp

+3 −1
Original line number Diff line number Diff line
@@ -4848,6 +4848,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 
    const String16 pathInterpolator16("pathInterpolator");

    const String16 objectAnimator16("objectAnimator");

    const String16 gradient16("gradient");

    const String16 animatedSelector16("animated-selector");



    const int minSdk = getMinSdkVersion(bundle);

    if (minSdk >= SDK_LOLLIPOP_MR1) {
@@ -4876,7 +4877,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 
                    node->getElementName() == animatedVector16 ||

                    node->getElementName() == objectAnimator16 ||

                    node->getElementName() == pathInterpolator16 ||

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

                    node->getElementName() == gradient16 ||

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

            // 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 == "gradient";

         name == "objectAnimator" || name == "gradient" || name == "animated-selector";

}



template <typename T>