diff options
author | Nancy Chen <nancychen@google.com> | 2015-10-12 20:44:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 20:44:08 +0000 |
commit | 7e5a4931b4bdefcc48bad288f2f8f976fb3c951c (patch) | |
tree | e20c60094982ec16026d753d78a4df98b8b26818 /InCallUI/res | |
parent | 30e6e3ecdda9cfcf372d796643147b4193a5aece (diff) | |
parent | 959f64ca92f343f5d86db2c7233da47e6c4b55b7 (diff) |
am 5ab00a4b: Merge "Add location information with business caller ID." into ub-contactsdialer-a-dev
* commit '5ab00a4b0aa7ae87f8b29f194715cfa6eda14aa5':
Add location information with business caller ID.
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_business_white_24dp.png | bin | 0 -> 152 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png | bin | 0 -> 371 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_business_white_24dp.png | bin | 0 -> 105 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png | bin | 0 -> 265 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png | bin | 0 -> 112 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png | bin | 0 -> 456 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png | bin | 0 -> 119 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png | bin | 0 -> 675 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png | bin | 0 -> 114 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png | bin | 0 -> 869 bytes | |||
-rw-r--r-- | InCallUI/res/layout/business_context_info_list_item.xml | 5 | ||||
-rw-r--r-- | InCallUI/res/values/dimens.xml | 1 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 7 |
13 files changed, 12 insertions, 1 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png Binary files differnew file mode 100644 index 000000000..d10ebb766 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_business_white_24dp.png diff --git a/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png Binary files differnew file mode 100644 index 000000000..7c281c3f5 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_location_on_white_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png Binary files differnew file mode 100644 index 000000000..7b9227c06 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_business_white_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png Binary files differnew file mode 100644 index 000000000..933eb5148 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_location_on_white_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png Binary files differnew file mode 100644 index 000000000..e5630455a --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_business_white_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png Binary files differnew file mode 100644 index 000000000..814ca8ddc --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_location_on_white_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png Binary files differnew file mode 100644 index 000000000..7dfc8dc52 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_business_white_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png Binary files differnew file mode 100644 index 000000000..078b10d4f --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_location_on_white_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png Binary files differnew file mode 100644 index 000000000..c9aea72ce --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_business_white_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png Binary files differnew file mode 100644 index 000000000..8bcb6f620 --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_location_on_white_24dp.png 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> |