From 7b2b43c0589ec79ba74359f7d9d6e0450fc322ab Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Thu, 17 Dec 2015 09:11:12 +0000
Subject: Show work badge icon/description in InCallUI/Dialer

Add work badge icon into IncallUI
Add work description into incoming call notification

To see this feature
1. Receive/Make a call from work contact
   (a contact in work profile has the phone number)
2. See work description in incoming call notification
   and work badge icon in IncallUI

BUG=26082618

Change-Id: I182b48a34d3d87ee3093e8433ae33939705d59d7
---
 InCallUI/res/layout/primary_call_info.xml | 11 +++++++++++
 InCallUI/res/values/strings.xml           | 10 ++++++++++
 2 files changed, 21 insertions(+)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 629d22047..5dcebd0dd 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -69,6 +69,17 @@
             android:clipChildren="false"
             android:clipToPadding="false">
 
+            <ImageView android:id="@+id/workProfileIcon"
+                android:src="@drawable/ic_work_profile"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:layout_marginEnd="8dp"
+                android:baselineAlignBottom="true"
+                android:tint="@color/incall_accent_color"
+                android:scaleType="center"
+                android:visibility="gone" />
+
             <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
             <ImageView android:id="@+id/callStateIcon"
                 android:layout_width="24dp"
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index b30ca6596..41b285275 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -145,16 +145,26 @@
     <string name="notification_missedCallTicker">Missed call from <xliff:g id="missed_call_from">%s</xliff:g></string>
     <!-- The "label" of the in-call Notification for an ongoing call. [CHAR LIMIT=60] -->
     <string name="notification_ongoing_call">Ongoing call</string>
+    <!-- The "label" of the in-call Notification for an ongoing work call. [CHAR LIMIT=60] -->
+    <string name="notification_ongoing_work_call">Ongoing work call</string>
     <!-- The "label" of the in-call Notification for an ongoing call, which is being made over
          Wi-Fi. [CHAR LIMIT=60] -->
     <string name="notification_ongoing_call_wifi">Ongoing Wi-Fi call</string>
+    <!-- The "label" of the in-call Notification for an ongoing work call, which is being made
+         over Wi-Fi. [CHAR LIMIT=60] -->
+    <string name="notification_ongoing_work_call_wifi">Ongoing Wi-Fi work call</string>
     <!-- The "label" of the in-call Notification for a call that's on hold -->
     <string name="notification_on_hold">On hold</string>
     <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
     <string name="notification_incoming_call">Incoming call</string>
+    <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
+    <string name="notification_incoming_work_call">Incoming work call</string>
     <!-- The "label" of the in-call Notification for an incoming ringing call,
          which is being made over Wi-Fi. [CHAR LIMIT=60] -->
     <string name="notification_incoming_call_wifi">Incoming Wi-Fi call</string>
+    <!-- The "label" of the in-call Notification for an incoming ringing work call,
+         which is being made over Wi-Fi. [CHAR LIMIT=60] -->
+    <string name="notification_incoming_work_call_wifi">Incoming Wi-Fi work call</string>
     <!-- The "label" of the in-call Notification for an incoming ringing video call. -->
     <string name="notification_incoming_video_call">Incoming video call</string>
     <!-- The "label" of the in-call Notification for upgrading an existing call to a video call. -->
-- 
cgit v1.2.3