diff options
| author | Hongwei Wang <hwwang@google.com> | 2013-09-17 10:23:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 10:23:24 -0700 |
| commit | 9bf9e6ac946fc2969d125fe23b83966cb35cc510 (patch) | |
| tree | 76db65bcb6ed236388f132d2545e2b46374b06bf /res | |
| parent | 2be4f1a086f5f60498c65b82065c72f1f78c01d5 (diff) | |
| parent | ed537e1bdf8c2b50f710aafa2c767dde5f32070c (diff) | |
am ed537e1b: Merge "Crossfade when drop to the position" into klp-dev
* commit 'ed537e1bdf8c2b50f710aafa2c767dde5f32070c':
Crossfade when drop to the position
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml | 6 | ||||
| -rw-r--r-- | res/values/animation_constants.xml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml index 6023fc84e..4d3abf490 100644 --- a/res/layout/phone_favorites_fragment.xml +++ b/res/layout/phone_favorites_fragment.xml @@ -45,5 +45,11 @@ android:layout_marginTop="@dimen/empty_message_top_margin" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceLarge"/> + + <ImageView + android:id="@+id/contact_tile_drag_shadow_overlay" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"/> </FrameLayout> </LinearLayout> diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index 77b762739..b41b316ff 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> <resources> - <integer name="fade_duration">250</integer> + <integer name="fade_duration">300</integer> <!-- Swipe constants --> <integer name="swipe_escape_velocity">100</integer> @@ -27,4 +27,4 @@ <dimen name="min_swipe">5dip</dimen> <dimen name="min_vert">10dip</dimen> <dimen name="min_lock">20dip</dimen> -</resources>
\ No newline at end of file +</resources> |