diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-16 19:30:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-16 19:30:04 +0000 |
| commit | f4165c4cf7a4152a5ef34856a53f7a7757483020 (patch) | |
| tree | d8a799a1548fbaee94ca3a0ac461d6e0829601a4 | |
| parent | 00d31c2760629e18088bcbfe2fe1c01e266bb866 (diff) | |
| parent | ab2a38c03d54fad1ed0873ac091959ee38823cd6 (diff) | |
Merge "AAPT leave <gradient> alone for VDC"
| -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 8cc2a6169ec6..40d71a3429d0 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -447,7 +447,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> |