summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Lake <ilake@google.com> 2017-04-19 21:40:52 +0000
committer android-build-merger <android-build-merger@google.com> 2017-04-19 21:40:52 +0000
commit4d0f44d7a75424d9d16921520d21c72af83282ec (patch)
tree4aae8c9d4649cfaf750b3c9130977c51d8f25e97
parentd85e60aa467b6acee006bd14d5f8fe1b6cb5273f (diff)
parent28602c0921c8937b1a0d160d8df316bd15a4b846 (diff)
Merge changes from topic 'chooser' into oc-dev
am: 28602c0921 Change-Id: Ica1b9bf1acc23c89439c4c4adf7c998ee4372c96
-rw-r--r--core/res/res/values/themes_device_defaults.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index e0b4ec5027bb..d80ff1d1e313 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -794,6 +794,8 @@ easier.
<!-- Theme used for the intent picker activity. -->
<style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">
+ <item name="windowEnterTransition">@empty</item>
+ <item name="windowExitTransition">@empty</item>
<item name="windowIsTranslucent">true</item>
<item name="windowNoTitle">true</item>
<item name="windowBackground">@color/transparent</item>