summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-27 23:21:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-27 23:21:18 +0000
commit8a0a73e688a6278ab2b55a36dc60846eaff6a9fd (patch)
tree1ac52f4ce83f9a60764adec3f41e739103ecd219
parent839a81769ee9d183c4dd59fae47ab58d80098518 (diff)
parent3c2c42212368b08dee289a2457377a61da4b8caf (diff)
am 3c2c4221: Merge "Adjust card clipping specs" into lmp-preview-dev
* commit '3c2c42212368b08dee289a2457377a61da4b8caf': Adjust card clipping specs
-rw-r--r--res/values/dimens.xml4
-rw-r--r--src/com/android/dialer/list/ListsFragment.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e884566a1..dc285cffd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -61,7 +61,7 @@
<dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
<!-- Dimensions for most recent call shortcut cards -->
- <dimen name="recent_call_log_item_translation_z">5dp</dimen>
+ <dimen name="recent_call_log_item_translation_z">4dp</dimen>
<dimen name="recent_call_log_item_padding">8dp</dimen>
<!-- The maximum amount to clip on the left and right of the recent call shortcut card -->
<dimen name="recent_call_log_item_horizontal_clip_limit">20dp</dimen>
@@ -112,7 +112,7 @@
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
<!-- Elevation of the search box -->
- <dimen name="search_box_elevation">5dp</dimen>
+ <dimen name="search_box_elevation">4dp</dimen>
<!-- Size of text in tabs. -->
<dimen name="tab_height">43dp</dimen>
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 2ff5a2a5b..229f7f3cc 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -126,12 +126,12 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
private PanelSlideListener mPanelSlideListener = new PanelSlideListener() {
@Override
public void onPanelSlide(View panel, float slideOffset) {
- // For every 1 percent that the panel is slid upwards, clip 2 percent from each edge
+ // For every 1 percent that the panel is slid upwards, clip 3 percent from each edge
// of the shortcut card, to achieve the animated effect of the shortcut card
// rapidly shrinking and disappearing from view when the panel is slid upwards.
// slideOffset is 1 when the shortcut card is fully exposed, and 0 when completely
// hidden.
- float ratioCardHidden = (1 - slideOffset) * 2f;
+ float ratioCardHidden = (1 - slideOffset) * 3f;
if (mShortcutCardsListView.getCount() > 0) {
SwipeableShortcutCard v =
(SwipeableShortcutCard) mShortcutCardsListView.getChildAt(0);