Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-09 22:27:53 +00:00
committed by Android (Google) Code Review
parent c81ef19954 f55db8c364
commit 35e1410551
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/ResourceTable.cpp
View File

@@ -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;
}

2
tools/aapt2/cmd/Link.cpp
View File

@@ -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>