summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-27 20:44:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-27 20:44:10 +0000
commita5cc11530874f928bdcd08d9866ff5602966a565 (patch)
tree187044bf66196e55833013a2f05455e1182e7388
parenta1619b6e334028584c6b071f099ff507fb9a915a (diff)
parentb1c31cd81dd02b63ece5b68103d2d5c395eb3a0a (diff)
am 203f52c5: Increase vertical padding on the secondary call info.
* commit '203f52c5836ce63cca312a5b7df82cb56b904943': Increase vertical padding on the secondary call info.
-rw-r--r--InCallUI/res/layout/secondary_call_info.xml4
-rw-r--r--InCallUI/res/values/dimens.xml6
2 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index e45d90d2d..8b39b0507 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -23,8 +23,8 @@
android:orientation="horizontal"
android:paddingStart="@dimen/call_banner_side_padding"
android:paddingEnd="@dimen/secondary_call_banner_right_padding"
- android:paddingTop="@dimen/call_banner_top_bottom_padding"
- android:paddingBottom="@dimen/call_banner_top_bottom_padding"
+ android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
+ android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
android:background="@color/incall_banner_secondary_background_color"
android:elevation="@dimen/secondary_call_elevation" >
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index e34aca8da..cef0ee5ff 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -32,7 +32,7 @@
<dimen name="secondary_call_banner_right_padding">24dp</dimen>
<!-- Padding at the top and bottom edges of the "call banner". -->
<dimen name="call_banner_primary_call_top_padding">24dp</dimen>
- <dimen name="call_banner_top_bottom_padding">8dp</dimen>
+ <dimen name="call_banner_secondary_call_top_bottom_padding">24dp</dimen>
<!-- Padding at the top and bottom edges of the "provider information" -->
<dimen name="provider_info_top_bottom_padding">8dp</dimen>
@@ -55,8 +55,8 @@
<!-- Height of buttons in the extra button row. -->
<dimen name="extra_row_button_height">@dimen/in_call_button_dimension</dimen>
- <dimen name="primary_call_elevation">8dp</dimen>
- <dimen name="secondary_call_elevation">8dp</dimen>
+ <dimen name="primary_call_elevation">4dp</dimen>
+ <dimen name="secondary_call_elevation">4dp</dimen>
<!-- Padding at the left and right edges of the incall_touch_ui button