Merge "UI for InCall context for outgoing calls to a business." into ub-contactsdialer-a-dev
diff --git a/InCallUI/res/layout/business_call_info_list_item.xml b/InCallUI/res/layout/business_call_info_list_item.xml
new file mode 100644
index 0000000..0a2478f
--- /dev/null
+++ b/InCallUI/res/layout/business_call_info_list_item.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <ImageView android:id="@+id/icon"
+ android:layout_width="@dimen/business_call_context_image_size"
+ android:layout_height="@dimen/business_call_context_image_size"
+ android:scaleType="centerCrop"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="@dimen/business_call_context_image_padding"
+ android:layout_marginRight="@dimen/business_call_context_image_padding"/>
+ <TextView android:id="@+id/heading"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@id/icon"
+ android:textSize="@dimen/business_call_context_heading_font_size"
+ android:textColor="@color/business_call_context_text_color"
+ android:fontFamily="sans-serif-medium"/>
+ <TextView android:id="@+id/detail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@id/icon"
+ android:layout_below="@id/heading"
+ android:textSize="@dimen/business_call_context_detail_font_size"
+ android:textColor="@color/business_call_context_text_color"
+ android:fontFamily="sans-serif-medium"/>
+ </RelativeLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 1887e6b..87280b3 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -53,7 +53,6 @@
</LinearLayout>
-
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -79,6 +78,7 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical"
+ android:background="@color/incall_background_color"
android:visibility="gone">
<TextView android:id="@+id/contextTitle"
android:textSize="@dimen/call_context_title_text_size"
@@ -86,12 +86,13 @@
android:fontFamily="sans-serif-medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal" />
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="@dimen/call_context_title_margin_bottom"/>
<ListView android:id="@+id/callContextInfo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
- android:dividerHeight="0dp" />
+ android:dividerHeight="@dimen/call_context_list_item_padding"/>
</LinearLayout>
</FrameLayout>
diff --git a/InCallUI/res/layout/contact_call_info_list_item.xml b/InCallUI/res/layout/contact_call_info_list_item.xml
index 645ca72..424b59d 100644
--- a/InCallUI/res/layout/contact_call_info_list_item.xml
+++ b/InCallUI/res/layout/contact_call_info_list_item.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="@dimen/contact_call_context_horizontal_padding"
- android:paddingLeft="@dimen/contact_call_context_horizontal_padding"
- android:paddingTop="@dimen/contact_call_context_top_padding">
+ android:paddingLeft="@dimen/contact_call_context_horizontal_padding">
<TextView android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index dd80671..409c2d2 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -115,4 +115,5 @@
<color name="contact_call_context_message_text_color">@color/dialer_theme_color</color>
<color name="contact_call_context_message_background_color">@color/incall_call_banner_subtext_color</color>
<color name="contact_call_context_detail_text_color">@color/incall_call_banner_subtext_color</color>
+ <color name="business_call_context_text_color">@color/incall_call_banner_subtext_color</color>
</resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index dc9e881..7738336 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -121,8 +121,10 @@
<dimen name="conference_call_manager_button_dimension">46dp</dimen>
<dimen name="call_context_title_text_size">14sp</dimen>
+ <dimen name="call_context_title_margin_bottom">13dp</dimen>
+ <dimen name="call_context_list_item_padding">13dp</dimen>
+
<dimen name="contact_call_context_horizontal_padding">30dp</dimen>
- <dimen name="contact_call_context_top_padding">15dp</dimen>
<dimen name="contact_call_context_message_text_size">16sp</dimen>
<dimen name="contact_call_context_message_vertical_padding">7dp</dimen>
<dimen name="contact_call_context_message_horizontal_padding">12dp</dimen>
@@ -130,4 +132,9 @@
<dimen name="contact_call_content_message_background_accent_radius">2dp</dimen>
<dimen name="contact_call_context_detail_padding_top">7dp</dimen>
<dimen name="contact_call_context_detail_text_size">14sp</dimen>
+
+ <dimen name="business_call_context_image_size">25dp</dimen>
+ <dimen name="business_call_context_image_padding">20dp</dimen>
+ <dimen name="business_call_context_heading_font_size">18sp</dimen>
+ <dimen name="business_call_context_detail_font_size">13sp</dimen>
</resources>