From e838ba2b69cf85b0d938467477e47cce4af2bfb6 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Fri, 2 Oct 2015 10:51:50 -0700
Subject: Add location information with business caller ID.

Display business address and distance when available when calling
businesses. This information is only displayed during outgoing calls and
while in the call.

Bug: 23351559

Change-Id: Ifb9197cc3abf6d865e13de10862c610e8aa15fba
---
 InCallUI/res/drawable-hdpi/ic_business_white_24dp.png     | Bin 0 -> 152 bytes
 InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png  | Bin 0 -> 371 bytes
 InCallUI/res/drawable-mdpi/ic_business_white_24dp.png     | Bin 0 -> 105 bytes
 InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png  | Bin 0 -> 265 bytes
 InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png    | Bin 0 -> 112 bytes
 InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png | Bin 0 -> 456 bytes
 InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png   | Bin 0 -> 119 bytes
 .../res/drawable-xxhdpi/ic_location_on_white_24dp.png     | Bin 0 -> 675 bytes
 InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png  | Bin 0 -> 114 bytes
 .../res/drawable-xxxhdpi/ic_location_on_white_24dp.png    | Bin 0 -> 869 bytes
 InCallUI/res/layout/business_context_info_list_item.xml   |   5 ++++-
 InCallUI/res/values/dimens.xml                            |   1 +
 InCallUI/res/values/strings.xml                           |   7 +++++++
 13 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 InCallUI/res/drawable-hdpi/ic_business_white_24dp.png
 create mode 100644 InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png
 create mode 100644 InCallUI/res/drawable-mdpi/ic_business_white_24dp.png
 create mode 100644 InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png
new file mode 100644
index 000000000..d10ebb766
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png differ
diff --git a/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png
new file mode 100644
index 000000000..7c281c3f5
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png differ
diff --git a/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png
new file mode 100644
index 000000000..7b9227c06
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png differ
diff --git a/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png
new file mode 100644
index 000000000..933eb5148
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png
new file mode 100644
index 000000000..e5630455a
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 000000000..814ca8ddc
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png
new file mode 100644
index 000000000..7dfc8dc52
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 000000000..078b10d4f
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png
new file mode 100644
index 000000000..c9aea72ce
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 000000000..8bcb6f620
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png differ
diff --git a/InCallUI/res/layout/business_context_info_list_item.xml b/InCallUI/res/layout/business_context_info_list_item.xml
index 7ed528ce4..eba98ac87 100644
--- a/InCallUI/res/layout/business_context_info_list_item.xml
+++ b/InCallUI/res/layout/business_context_info_list_item.xml
@@ -15,11 +15,14 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
      android:layout_width="match_parent"
-     android:layout_height="wrap_content">
+     android:layout_height="wrap_content"
+     android:paddingEnd="@dimen/business_contact_context_end_padding">
      <ImageView android:id="@+id/icon"
          android:layout_width="@dimen/business_contact_context_image_size"
          android:layout_height="@dimen/business_contact_context_image_size"
          android:scaleType="centerCrop"
+         android:tint="@color/business_contact_context_text_color"
+         android:alpha="0.8"
          android:layout_centerVertical="true"
          android:layout_marginLeft="@dimen/business_contact_context_image_padding"
          android:layout_marginRight="@dimen/business_contact_context_image_padding"/>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 02527d3f2..e40784671 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -133,6 +133,7 @@
     <dimen name="person_contact_context_detail_padding_top">7dp</dimen>
     <dimen name="person_contact_context_detail_text_size">14sp</dimen>
 
+    <dimen name="business_contact_context_end_padding">10dp</dimen>
     <dimen name="business_contact_context_image_size">25dp</dimen>
     <dimen name="business_contact_context_image_padding">20dp</dimen>
     <dimen name="business_contact_context_heading_font_size">18sp</dimen>
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 0d0aab3ae..7a90953f4 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -470,4 +470,11 @@
 
     <!-- Title for the call context with a business-type contact. [CHAR LIMIT=40] -->
     <string name="business_contact_context_title">Business info</string>
+
+    <!-- Distance strings for business caller ID context. -->
+
+    <!-- Used to inform the user how far away a location is in miles. [CHAR LIMIT=NONE] -->
+    <string name="distance_imperial_away"><xliff:g id="distance">%.1f</xliff:g> mi away</string>
+    <!-- Used to inform the user how far away a location is in kilometers. [CHAR LIMIT=NONE] -->
+    <string name="distance_metric_away"><xliff:g id="distance">%.1f</xliff:g> km away</string>
 </resources>
-- 
cgit v1.2.3