summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-03-18 15:30:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-18 15:30:38 +0000
commit6f24e4846a5eb310950eb6319bab34f7980dc510 (patch)
tree59aaa257ec21246503b966aac231c244295f422a
parent518cfec4ee973746705572e57feb5dcc943f0bed (diff)
parent1520d60cc5379a06e3f80a948ebeb157e4891e6c (diff)
am 1520d60c: am 79a677cf: am fffd025d: am 74af8088: Corrected issue where history icon placement does not match spec. DO NOT MERGE
* commit '1520d60cc5379a06e3f80a948ebeb157e4891e6c': Corrected issue where history icon placement does not match spec. DO NOT MERGE
-rw-r--r--res/layout/call_log_list_item.xml6
-rw-r--r--res/values/dimens.xml4
2 files changed, 3 insertions, 7 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index e39b41314..e17dc279b 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -147,12 +147,8 @@
<!-- The secondary action button; either play voicemail or call details. -->
<ImageButton
android:id="@+id/secondary_action_icon"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_inner_margin"
- android:paddingTop="@dimen/call_log_inner_margin"
- android:paddingBottom="@dimen/call_log_inner_margin"
- android:paddingEnd="@dimen/call_log_inner_margin"
android:scaleType="center"
android:background="?android:attr/selectableItemBackground"
android:nextFocusLeft="@id/primary_action_view"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e3f2188b0..f0e36bc2e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,7 +27,7 @@
<!-- Call Log -->
<dimen name="call_log_call_action_size">32dip</dimen>
- <dimen name="call_log_call_action_width">48dip</dimen>
+ <dimen name="call_log_call_action_width">54dp</dimen>
<dimen name="call_log_icon_margin">4dip</dimen>
<dimen name="call_log_inner_margin">8dip</dimen>
<dimen name="call_log_outer_margin">8dip</dimen>
@@ -38,7 +38,7 @@
<dimen name="call_detail_button_spacing">2dip</dimen>
<!-- Defines the vertical margin for the vertical separator between
the main area of a call log entry and the secondary action button. -->
- <dimen name="call_log_list_item_vertical_divider_margin">8dp</dimen>
+ <dimen name="call_log_list_item_vertical_divider_margin">17dp</dimen>
<!-- Defines the width of the vertical separator between
the main area of a call log entry and the secondary action button. -->