summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-30 19:40:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-30 19:40:41 +0000
commita05715b9df049d3154f2f9124069e458c1596eee (patch)
tree234d79deae0384fe18a654bb65ca4fedc36788d8
parent1d7ef6a59ae175d1577ca707e2682924a60d341d (diff)
parent0667726c37147d6e2c93491f06535cb06ea1371a (diff)
Merge "Updating speed dial to match redlines." into lmp-preview-dev
-rw-r--r--res/layout/phone_favorite_tile_view.xml22
-rw-r--r--res/values/dimens.xml6
2 files changed, 19 insertions, 9 deletions
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 01d855be9..7abff2717 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -32,11 +32,21 @@
android:layout_height="match_parent"
android:scaleType="centerCrop" />
- <View
- android:id="@+id/shadow_overlay"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/shadow_contact_photo" />
+ android:orientation="vertical">
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="6" />
+ <View
+ android:id="@+id/shadow_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="4"
+ android:background="@drawable/shadow_contact_photo" />
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -58,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/contact_tile_name_color"
- android:fontFamily="sans-serif"
+ android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textSize="15sp"
android:fadingEdge="horizontal"
@@ -102,10 +112,10 @@
android:layout_height="@dimen/contact_tile_info_button_height_and_width"
android:layout_width="@dimen/contact_tile_info_button_height_and_width"
android:paddingLeft="4dp"
- android:paddingRight="4dp"
+ android:paddingRight="9dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
- android:paddingTop="4dp"
+ android:paddingTop="8dp"
android:paddingBottom="4dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 01ec9695d..7318d92e8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,9 +51,9 @@
<!-- Dimensions for speed dial tiles -->
<dimen name="contact_tile_divider_width">1dp</dimen>
<dimen name="contact_tile_info_button_height_and_width">36dp</dimen>
- <item name="contact_tile_height_to_width_ratio" type="dimen">67%</item>
- <dimen name="contact_tile_text_side_padding">10dp</dimen>
- <dimen name="contact_tile_text_bottom_padding">8dp</dimen>
+ <item name="contact_tile_height_to_width_ratio" type="dimen">80%</item>
+ <dimen name="contact_tile_text_side_padding">12dp</dimen>
+ <dimen name="contact_tile_text_bottom_padding">9dp</dimen>
<dimen name="favorites_row_top_padding">1dp</dimen>
<dimen name="favorites_row_bottom_padding">0dp</dimen>
<dimen name="favorites_row_start_padding">1dp</dimen>