diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
|---|---|---|
| committer | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
| commit | 4e4914b22b779e6376bb00ae20636175b2a70d8c (patch) | |
| tree | f4ebc5eae2c99e20aceefcc9ffc3de19782f0fbe /tools/aapt/ResourceTable.cpp | |
| parent | dbed40a3cd31af821ea99c605664908d67df2747 (diff) | |
| parent | ed5d4d06907844e1c87a6ee17c4f2868a8cc6d56 (diff) | |
PPR1.180219.001_AOSP_Merge
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
telecomm/java/android/telecom/Call.java
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java
Change-Id: I524d38a61608069028b3496a189118d8eff75f4b
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 669afe18af88..734a5ab8aab4 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -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; } |