Merge "Try adjustments to the archive animation per danship." into jb-ub-mail
diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml
index e3b6642..977f942 100644
--- a/res/values/animation_constants.xml
+++ b/res/values/animation_constants.xml
@@ -24,15 +24,15 @@
<integer name="fade_duration">250</integer>
<integer name="dialog_animationDefaultDur">220</integer>
<integer name="dialog_animationShortDur">150</integer>
- <integer name="shrink_animation_duration">500</integer>
- <integer name="slide_animation_duration">500</integer>
+ <integer name="shrink_animation_duration">350</integer>
+ <integer name="slide_animation_duration">350</integer>
<!-- Swipe constants -->
<integer name="swipe_escape_velocity">100</integer>
<integer name="escape_animation_duration">200</integer>
<integer name="max_escape_animation_duration">400</integer>
<integer name="max_dismiss_velocity">2000</integer>
- <integer name="snap_animation_duration">500</integer>
+ <integer name="snap_animation_duration">350</integer>
<integer name="dismiss_animation_duration">500</integer>
<dimen name="min_swipe">10dip</dimen>
<dimen name="min_vert">10dip</dimen>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 3cf50a9..3c8f259 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -97,6 +97,6 @@
<dimen name="photo_overlay_bottom_padding">6dp</dimen>
<dimen name="attachment_tile_min_size">120dp</dimen>
<dimen name="toast_bar_bottom_margin_in_conversation">24dip</dimen>
- <dimen name="undo_animation_offset">600dp</dimen>
+ <dimen name="undo_animation_offset">400dp</dimen>
<dimen name="wait_padding">16dp</dimen>
</resources>