diff options
| author | 2017-10-13 15:56:08 -0700 | |
|---|---|---|
| committer | 2017-10-16 10:34:27 -0700 | |
| commit | ab2a38c03d54fad1ed0873ac091959ee38823cd6 (patch) | |
| tree | 5a360c6adc7e4e733e2a5d1d326a9b993ba5f20d | |
| parent | 404f23d6d0950754f4d4d65606379889c922a3eb (diff) | |
AAPT leave <gradient> alone for VDC
bug: 62421666
Test: Tested with changes for Gradient of VDC.
Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 | ||||
| -rw-r--r-- | tools/aapt2/cmd/Link.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 52b93a945433..669afe18af88 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -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; } diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 88e0f699fd58..d7d1d3e609a5 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -446,7 +446,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> |