summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/contactgrid/res
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2017-10-11 12:23:29 -0700
committerEric Erfanian <erfanian@google.com>2017-10-12 14:29:13 -0700
commitd0f207f160a4abac488de29df82a842b6e3a353d (patch)
treeb10a3c7ea109986c813655ba5a63db6a2a00059b /java/com/android/incallui/contactgrid/res
parente6a6356935c3a35d41133833e8a9cc2b7a108962 (diff)
Fix incallui to use latest ux mocks for assisted dialing.
* Remove old language icon from bottom row. Screenshot=In change as scuba test Bug: 64205446 Test: new unit tests PiperOrigin-RevId: 171858076 Change-Id: Idf781be193dae3593f778af1ac833f046abd87e3
Diffstat (limited to 'java/com/android/incallui/contactgrid/res')
-rw-r--r--java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml4
-rw-r--r--java/com/android/incallui/contactgrid/res/values/strings.xml3
2 files changed, 3 insertions, 4 deletions
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
index c545c25cd..ce355ea2d 100644
--- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
@@ -31,10 +31,6 @@
style="@style/BottomRowIcon"
android:visibility="gone"/>
<ImageView
- android:id="@+id/contactgrid_assistedDialingIcon"
- style="@style/BottomRowIcon"
- android:src="@drawable/quantum_ic_language_vd_theme_24"/>
- <ImageView
android:id="@id/contactgrid_forwardIcon"
style="@style/BottomRowIcon"
android:src="@drawable/quantum_ic_forward_vd_theme_24"/>
diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml
index eba4abf30..c6bdb11ba 100644
--- a/java/com/android/incallui/contactgrid/res/values/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values/strings.xml
@@ -24,6 +24,9 @@
in the connecting stage. -->
<string name="incall_connecting">Calling…</string>
+ <!-- Display information related to assisted dialing, for example Calling using +1 (US)… -->
+ <string name="incall_connecting_assited_dialed">Calling using +<xliff:g example="1" id="ad_country_code">%1$s</xliff:g> (<xliff:g example="1" id="ad_user_home_locale">%2$s</xliff:g>)\u2026</string>
+
<!-- Displayed above the contact name when an external call is being pulled to the local
device. -->
<string name="incall_transferring">Transferring…</string>