summaryrefslogtreecommitdiff
path: root/tests/ActivityTests
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-05-10 15:40:35 -0700
committerColin Cross <ccross@android.com>2018-05-10 22:16:21 -0700
commita864902d0528911d1b05950c8302d9e98851f15b (patch)
tree90b60942aa5456f8159f4a5c25103f956f7b59a0 /tests/ActivityTests
parent2a661bff8283104648d6e4e82561a6cd4bf37082 (diff)
Fix errors caught by aapt2
Fixes: frameworks/base/tests/ActivityTests/res/values/themes.xml:18: error: resource previously defined here. frameworks/base/tests/ActivityTests/res/values/themes.xml:21: error: duplicate value for resource 'style/SlowDialog' with config ''. Bug: 79481102 Test: m java FORCE_AAPT2=true Change-Id: I06b1552220b5acd8790d72555e36a0466c523b67
Diffstat (limited to 'tests/ActivityTests')
-rw-r--r--tests/ActivityTests/res/values/themes.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/ActivityTests/res/values/themes.xml b/tests/ActivityTests/res/values/themes.xml
index c11d2e48834a..1c3053710e7f 100644
--- a/tests/ActivityTests/res/values/themes.xml
+++ b/tests/ActivityTests/res/values/themes.xml
@@ -17,8 +17,6 @@
<resources>
<style name="SlowDialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowAnimationStyle">@style/SlowDialog</item>
- </style>
- <style name="SlowDialog">
<item name="android:windowEnterAnimation">@anim/slow_enter</item>
<item name="android:windowExitAnimation">@anim/slow_exit</item>
</style>