summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-06-11 10:50:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 10:50:35 +0000
commitaaeea64a83bdd73665f5999c3645af35e341139c (patch)
treeae25dea694b54260fc602a1248d35e1fb9ed9d00 /res
parente42b8ca160db365adb3dd99a5792a778b12ca081 (diff)
parenta9a75dc1956f4b6a3d3527b7b9e204acbb316b68 (diff)
am a9a75dc1: Merge "UI improvements on tabs, recent expanded card, speed dial grid." into lmp-preview-dev
* commit 'a9a75dc1956f4b6a3d3527b7b9e204acbb316b68': UI improvements on tabs, recent expanded card, speed dial grid.
Diffstat (limited to 'res')
-rw-r--r--res/layout/phone_favorite_tile_view.xml5
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/styles.xml3
4 files changed, 6 insertions, 7 deletions
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 1e6b999b1..d34dc7a73 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -17,7 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_tile"
class="com.android.dialer.list.PhoneFavoriteSquareTileView"
- android:paddingEnd="@dimen/contact_tile_divider_width">
+ android:paddingEnd="@dimen/contact_tile_divider_width"
+ android:paddingBottom="@dimen/contact_tile_divider_width">
<RelativeLayout
android:id="@+id/contact_favorite_card"
@@ -50,8 +51,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/contact_tile_text_side_padding"
- android:paddingRight="@dimen/contact_tile_text_side_padding"
android:paddingStart="@dimen/contact_tile_text_side_padding"
android:paddingEnd="@dimen/contact_tile_text_side_padding"
android:paddingBottom="@dimen/contact_tile_text_bottom_padding"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 771d187f6..f8af12e2f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -42,7 +42,7 @@
<!-- White background for dialer -->
<color name="background_dialer_white">#ffffff</color>
<!-- Background color of new dialer activity -->
- <color name="background_dialer_light">#fbfbfb</color>
+ <color name="background_dialer_light">#f6f6f6</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
<color name="background_dialer_list_items">@color/background_dialer_light</color>
@@ -74,6 +74,7 @@
<!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
<color name="contacts_grid_bottom_border_color">#16000000</color>
+ <color name="call_log_expanded_background_color">#ffffff</color>
<!-- Color of actions in expanded call log entries. This text color represents actions such
as call back, play voicemail, etc. -->
<color name="call_log_action_text">#1dc7db</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index db0dde545..4b955c6a4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,7 +51,7 @@
<item name="contact_tile_height_to_width_ratio" type="dimen">76%</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_top_padding">2dp</dimen>
<dimen name="favorites_row_bottom_padding">0dp</dimen>
<dimen name="favorites_row_start_padding">1dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 07ab1fb79..ac1afa15e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -139,8 +139,7 @@
parent="android:style/Widget.Material.Light.ActionBar.TabText">
<item name="android:textColor">@color/tab_text_color</item>
<item name="android:textSize">@dimen/tab_text_size</item>
- <item name="android:fontFamily">@string/tab_font_family</item>
- <item name="android:textStyle">bold</item>
+ <item name="android:fontFamily">"sans-serif-medium"</item>
</style>
<style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">