summaryrefslogtreecommitdiff
path: root/InCallUI/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-07-15 11:54:17 -0700
committerAndrew Lee <anwlee@google.com>2014-07-16 11:04:51 -0700
commit77701216b331f54d2d7ccb95b97f2cf98f2c3957 (patch)
treebaf9f7a25d7e963b384b6561c1a4c699a843233e /InCallUI/res
parent10a7a7b70665c43850602fb77e97a00cbf768e19 (diff)
Add video call handling for heads up notifications.
- Add isVideo method to the InCallUI call. - Added cases and actions for isVideo to StatusBarNotifier. - Added cases for isVideo for processing incoming call in the full-screen experience in AnswerPresenter. - Did what I figured would be some cleanup, to consolidate some helper methods only ever called once, and reorder some methods to be more alphabetical. - Added new intent type for video calls (and revised old one for audio calls), which are dispatched by the StatusBarNotifier and received by the InCallApp. - Update icons used, and deleted unused icons. Bug: 16013878 Change-Id: If0a8d04e2ee6eaf8258ce6a677b22d55a584f9ab
Diffstat (limited to 'InCallUI/res')
-rw-r--r--InCallUI/res/drawable-hdpi/stat_sys_phone_call.pngbin1095 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/stat_sys_phone_call_end.pngbin903 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-ldrtl-hdpi/stat_sys_phone_call.pngbin4993 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-ldrtl-mdpi/stat_sys_phone_call.pngbin4578 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.pngbin5428 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/stat_sys_phone_call.pngbin796 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/stat_sys_phone_call_end.pngbin670 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/stat_sys_phone_call.pngbin1430 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/stat_sys_phone_call_end.pngbin1213 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.pngbin2089 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.pngbin3458 -> 0 bytes
-rw-r--r--InCallUI/res/values/strings.xml4
12 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/drawable-hdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-hdpi/stat_sys_phone_call.png
deleted file mode 100644
index 7eda84ca5..000000000
--- a/InCallUI/res/drawable-hdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_end.png b/InCallUI/res/drawable-hdpi/stat_sys_phone_call_end.png
deleted file mode 100644
index bc7493751..000000000
--- a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_end.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png
deleted file mode 100644
index e0f33f88c..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png
deleted file mode 100644
index d771d87bf..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
deleted file mode 100644
index 86af9c202..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-mdpi/stat_sys_phone_call.png
deleted file mode 100644
index 70a4bbe71..000000000
--- a/InCallUI/res/drawable-mdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_end.png b/InCallUI/res/drawable-mdpi/stat_sys_phone_call_end.png
deleted file mode 100644
index 15e7e67fc..000000000
--- a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_end.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-xhdpi/stat_sys_phone_call.png
deleted file mode 100644
index 1bb434076..000000000
--- a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_end.png b/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_end.png
deleted file mode 100644
index b0b1bc1c8..000000000
--- a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_end.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png
deleted file mode 100644
index 934838484..000000000
--- a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png
deleted file mode 100644
index 1f3a81bb5..000000000
--- a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 3c1030225..19ba8a6c8 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -211,10 +211,10 @@
scenarios such as accepting an incoming call or accepting a video call request.
[CHAR LIMIT=40] -->
<string name="notification_action_accept">Accept</string>
- <!-- Label for "Decline" notification action. This is somewhat generic, and may refer to
+ <!-- Label for "Dismiss" notification action. This is somewhat generic, and may refer to
scenarios such as declining an incoming call or declining a video call request.
[CHAR LIMIT=40] -->
- <string name="notification_action_decline">Decline</string>
+ <string name="notification_action_dismiss">Dismiss</string>
<!-- Message for "call back" Action, which is displayed in the missed call notificaiton.
The user will be able to call back to the person or the phone number.