summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/contactgrid/res
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-02-22 16:32:36 -0800
committerEric Erfanian <erfanian@google.com>2017-03-01 09:56:52 -0800
commitccca31529c07970e89419fb85a9e8153a5396838 (patch)
treea7034c0a01672b97728c13282a2672771cd28baa /java/com/android/incallui/contactgrid/res
parente7ae4624ba6f25cb8e648db74e0d64c0113a16ba (diff)
Update dialer sources.
Test: Built package and system image. This change clobbers the old source, and is an export from an internal Google repository. The internal repository was forked form Android in March, and this change includes modifications since then, to near the v8 release. Since the fork, we've moved code from monolithic to independent modules. In addition, we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make. New dependencies have been added: - Dagger - Auto-Value - Glide - Libshortcutbadger Going forward, development will still be in Google3, and the Gerrit release will become an automated export, with the next drop happening in ~ two weeks. Android.mk includes local modifications from ToT. Abridged changelog: Bug fixes ● Not able to mute, add a call when using Phone app in multiwindow mode ● Double tap on keypad triggering multiple key and tones ● Reported spam numbers not showing as spam in the call log ● Crash when user tries to block number while Phone app is not set as default ● Crash when user picks a number from search auto-complete list Visual Voicemail (VVM) improvements ● Share Voicemail audio via standard exporting mechanisms that support file attachment (email, MMS, etc.) ● Make phone number, email and web sites in VVM transcript clickable ● Set PIN before declining VVM Terms of Service {Carrier} ● Set client type for outbound visual voicemail SMS {Carrier} New incoming call and incall UI on older devices (Android M) ● Updated Phone app icon ● New incall UI (large buttons, button labels) ● New and animated Answer/Reject gestures Accessibility ● Add custom answer/decline call buttons on answer screen for touch exploration accessibility services ● Increase size of touch target ● Add verbal feedback when a Voicemail fails to load ● Fix pressing of Phone buttons while in a phone call using Switch Access ● Fix selecting and opening contacts in talkback mode ● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text Other ● Backup & Restore for App Preferences ● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is connected ● Rename “Dialpad” to “Keypad” ● Show "Private number" for restricted calls ● Delete unused items (vcard, add contact, call history) from Phone menu Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958
Diffstat (limited to 'java/com/android/incallui/contactgrid/res')
-rw-r--r--java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml71
-rw-r--r--java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml26
-rw-r--r--java/com/android/incallui/contactgrid/res/values/ids.xml31
-rw-r--r--java/com/android/incallui/contactgrid/res/values/strings.xml69
4 files changed, 197 insertions, 0 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
new file mode 100644
index 000000000..3900be556
--- /dev/null
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_horizontal"
+ tools:showIn="@layout/incall_contact_grid">
+ <ImageView
+ android:id="@id/contactgrid_workIcon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/ic_work_profile"
+ android:tint="#ffffff"
+ tools:visibility="gone"
+ />
+ <ImageView
+ android:id="@id/contactgrid_hdIcon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/quantum_ic_hd_white_24"
+ tools:visibility="gone"
+ />
+ <ImageView
+ android:id="@id/contactgrid_forwardIcon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/quantum_ic_forward_white_24"
+ tools:visibility="gone"
+ />
+ <ImageView
+ android:id="@+id/contactgrid_spamIcon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="8dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/quantum_ic_report_white_18"
+ tools:visibility="gone"
+ />
+ <ViewAnimator
+ android:id="@+id/contactgrid_bottom_text_switcher"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="2dp"
+ android:measureAllChildren="false">
+ <TextView
+ android:id="@+id/contactgrid_bottom_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:singleLine="true"
+ android:textAppearance="@style/Dialer.Incall.TextAppearance"
+ tools:gravity="start"
+ tools:text="Mobile +1 (650) 253-0000"/>
+ <Chronometer
+ android:id="@+id/contactgrid_bottom_timer"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:singleLine="true"
+ android:textAppearance="@style/Dialer.Incall.TextAppearance"
+ tools:gravity="center"/>
+ </ViewAnimator>
+</LinearLayout>
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml
new file mode 100644
index 000000000..59359c9c1
--- /dev/null
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal"
+ tools:showIn="@layout/incall_contact_grid">
+ <ImageView
+ android:id="@id/contactgrid_connection_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginEnd="10dp"
+ android:scaleType="fitCenter"
+ tools:src="@android:drawable/sym_def_app_icon"
+ tools:visibility="visible"
+ />
+ <TextView
+ android:id="@id/contactgrid_status_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/Dialer.Incall.TextAppearance"
+ tools:text="Captain Holt"/>
+</LinearLayout>
diff --git a/java/com/android/incallui/contactgrid/res/values/ids.xml b/java/com/android/incallui/contactgrid/res/values/ids.xml
new file mode 100644
index 000000000..821dc9d98
--- /dev/null
+++ b/java/com/android/incallui/contactgrid/res/values/ids.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 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
+ -->
+
+<resources>
+ <item name="contactgrid_connection_icon" type="id"/>
+ <item name="contactgrid_status_text" type="id"/>
+ <item name="contactgrid_contact_name" type="id"/>
+ <item name="contactgrid_workIcon" type="id"/>
+ <item name="contactgrid_hdIcon" type="id"/>
+ <item name="contactgrid_forwardIcon" type="id"/>
+ <item name="contactgrid_spamIcon" type="id"/>
+ <item name="contactgrid_bottom_text" type="id"/>
+ <item name="contactgrid_bottom_timer" type="id"/>
+ <item name="contactgrid_avatar" type="id"/>
+ <item name="contactgrid_top_row" type="id"/>
+ <item name="contactgrid_bottom_row" type="id"/>
+</resources>
diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml
new file mode 100644
index 000000000..385f843b1
--- /dev/null
+++ b/java/com/android/incallui/contactgrid/res/values/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Title displayed in the overlay for outgoing calls which include the name of the provider.
+ [CHAR LIMIT=40] -->
+ <string name="incall_calling_via_template">Calling via <xliff:g id="provider_name">%s</xliff:g></string>
+
+ <!-- Displayed above the contact name during an outgoing phone call. Indicates that the call is
+ in the connecting stage. -->
+ <string name="incall_connecting">Calling…</string>
+
+ <!-- Displayed above the contact name when an external call is being pulled to the local
+ device. -->
+ <string name="incall_transferring">Transferring…</string>
+
+ <!-- Displayed above the contact name when the user requests an upgrade from a voice call to a
+ video call. -->
+ <string name="incall_video_call_requesting">Video calling…</string>
+
+ <!-- Displayed above the contact name when the user requests an upgrade from a voice call to a
+ Wi-Fi video call. -->
+ <string name="incall_wifi_video_call_requesting">Wi-Fi video calling…</string>
+
+ <!-- Displayed above the contact name when the user's video upgrade failed due to an unknown
+ reason. -->
+ <string name="incall_video_call_request_failed">Unable to connect</string>
+
+ <!-- Displayed above the contact name when the user's video upgrade was declined by the remote
+ party. -->
+ <string name="incall_video_call_request_rejected">Call declined</string>
+
+ <!-- Displayed above the contact name when no response was received for the user's upgrade
+ requests and we timed out. -->
+ <string name="incall_video_call_request_timed_out">Call timed out</string>
+
+ <!-- In-call screen: status label for a call that's in the process of hanging up
+ [CHAR LIMIT=25] -->
+ <string name="incall_hanging_up">Hanging up</string>
+
+ <!-- In-call screen: status label displayed briefly after a call ends [CHAR LIMIT=25] -->
+ <string name="incall_call_ended">Call ended</string>
+
+ <!-- In-call screen: label shown at the top of the screen when a call is on hold by the remote
+ party [CHAR LIMIT=25] -->
+ <string name="incall_remotely_held">On hold</string>
+
+ <!-- Displayed in the answer call screen for incoming video calls. -->
+ <string name="contact_grid_incoming_video_call">Video call from</string>
+
+ <!-- Displayed in the answer call screen for incoming video calls over Wi-F. -->
+ <string name="contact_grid_incoming_wifi_video_call">Wi-Fi video call from</string>
+
+ <!-- Displayed in the answer call screen for incoming voice calls. -->
+ <string name="contact_grid_incoming_voice_call">Call from</string>
+
+ <!-- Displayed in the answer call screen for incoming voice calls. -->
+ <string name="contact_grid_incoming_work_call">Work call from</string>
+
+ <!-- Displayed in the answer call screen for incoming calls via a phone account. -->
+ <string name="contact_grid_incoming_via_template">Incoming via <xliff:g id="provider_name">%s</xliff:g></string>
+
+ <!-- Displayed in the answer call screen for incoming spam calls. -->
+ <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+
+ <!-- In-call screen: string shown to the user when their outgoing number is different than the
+ number reported by TelephonyManager#getLine1Number(). This is used for carriers like
+ Project Fi so that users can give their number to emergency responders. -->
+ <string name="contact_grid_callback_number">Callback number: <xliff:g id="dark_number">%1$s</xliff:g></string>
+</resources>