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

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

Browse Source
This commit is contained in:
Tenghui Zhu
2017-10-24 16:22:49 +00:00
committed by Android (Google) Code Review
parent 72b3d46794 f49cce3aa6
commit 81831f89ce
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

@@ -4847,6 +4847,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
const String16 animatedVector16("animated-vector"); const String16 animatedVector16("animated-vector");
const String16 pathInterpolator16("pathInterpolator"); const String16 pathInterpolator16("pathInterpolator");
const String16 objectAnimator16("objectAnimator"); const String16 objectAnimator16("objectAnimator");
const String16 gradient16("gradient");
const int minSdk = getMinSdkVersion(bundle); const int minSdk = getMinSdkVersion(bundle);
if (minSdk >= SDK_LOLLIPOP_MR1) { if (minSdk >= SDK_LOLLIPOP_MR1) {
@@ -4874,7 +4875,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 || if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 ||
node->getElementName() == animatedVector16 || node->getElementName() == animatedVector16 ||
node->getElementName() == objectAnimator16 || 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. // We were told not to version vector tags, so skip the children here.
continue; 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) { static bool IsVectorElement(const std::string& name) {
return name == "vector" || name == "animated-vector" || name == "pathInterpolator" || return name == "vector" || name == "animated-vector" || name == "pathInterpolator" ||
name == "objectAnimator"; name == "objectAnimator" || name == "gradient";
} }
template <typename T> template <typename T>