diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-04-11 20:37:05 -0700 |
---|---|---|
committer | Sarmad Hashmi <mhashmi@google.com> | 2016-04-11 20:37:05 -0700 |
commit | 215e1f189805fbc3dd30e084b715d5e219852902 (patch) | |
tree | a5b3c66f66e71bf8bfc2eb87c702a9b8ad712ad7 | |
parent | a231c013dad032cba8e4e15002ea96c4d9dcadac (diff) |
Add resources for after call spam notification.
+Block icon from https://icons.googleplex.com/#icon=ic_block
+Person add icon from https://icons.googleplex.com/#icon=ic_person_add
+X icon from https://icons.googleplex.com/#icon=ic_close
+Report icon from https://icons.googleplex.com/#icon=ic_report
+Question mark icon from @ycnzhao
+Added spam_notification_icon for the large icon in notifications for
first time spam calls
+Added unknown_notification_icon for the large icon in notifications for
first time calls (from any number)
+Added strings for after call notifications
+This is the same as ag/919969, we decided to move the after call spam
notification stuff to the AOSP dialer
BUG=27323295
Change-Id: I0aaabd8d2dbefeda5214481ce6315335e64c3c28
29 files changed, 78 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_block_grey600_24dp.png b/InCallUI/res/drawable-hdpi/ic_block_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..1e9294c12 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_block_grey600_24dp.png diff --git a/InCallUI/res/drawable-hdpi/ic_close_grey600_24dp.png b/InCallUI/res/drawable-hdpi/ic_close_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9ab350e9a --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_close_grey600_24dp.png diff --git a/InCallUI/res/drawable-hdpi/ic_person_add_grey600_24dp.png b/InCallUI/res/drawable-hdpi/ic_person_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..185d03393 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_person_add_grey600_24dp.png diff --git a/InCallUI/res/drawable-hdpi/ic_question_mark.png b/InCallUI/res/drawable-hdpi/ic_question_mark.png Binary files differnew file mode 100644 index 000000000..adab6c13f --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_question_mark.png diff --git a/InCallUI/res/drawable-hdpi/ic_report_white_36dp.png b/InCallUI/res/drawable-hdpi/ic_report_white_36dp.png Binary files differnew file mode 100644 index 000000000..919a872e0 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_report_white_36dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_block_grey600_24dp.png b/InCallUI/res/drawable-mdpi/ic_block_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..edd666b73 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_block_grey600_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_close_grey600_24dp.png b/InCallUI/res/drawable-mdpi/ic_close_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..73faf52eb --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_close_grey600_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_person_add_grey600_24dp.png b/InCallUI/res/drawable-mdpi/ic_person_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ec3237086 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_person_add_grey600_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_question_mark.png b/InCallUI/res/drawable-mdpi/ic_question_mark.png Binary files differnew file mode 100644 index 000000000..cfe64f696 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_question_mark.png diff --git a/InCallUI/res/drawable-mdpi/ic_report_white_36dp.png b/InCallUI/res/drawable-mdpi/ic_report_white_36dp.png Binary files differnew file mode 100644 index 000000000..dc0c995c1 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_report_white_36dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_block_grey600_24dp.png b/InCallUI/res/drawable-xhdpi/ic_block_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..36210a8cb --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_block_grey600_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_close_grey600_24dp.png b/InCallUI/res/drawable-xhdpi/ic_close_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a3896c5c6 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_close_grey600_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_person_add_grey600_24dp.png b/InCallUI/res/drawable-xhdpi/ic_person_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e56481ed7 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_person_add_grey600_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_question_mark.png b/InCallUI/res/drawable-xhdpi/ic_question_mark.png Binary files differnew file mode 100644 index 000000000..8da487088 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_question_mark.png diff --git a/InCallUI/res/drawable-xhdpi/ic_report_white_36dp.png b/InCallUI/res/drawable-xhdpi/ic_report_white_36dp.png Binary files differnew file mode 100644 index 000000000..aed766804 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_report_white_36dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_block_grey600_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_block_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9f5120373 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_block_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_close_grey600_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_close_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..22d7aa55e --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_close_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c17dfe05f --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_question_mark.png b/InCallUI/res/drawable-xxhdpi/ic_question_mark.png Binary files differnew file mode 100644 index 000000000..b9b6b00e7 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_question_mark.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_report_white_36dp.png b/InCallUI/res/drawable-xxhdpi/ic_report_white_36dp.png Binary files differnew file mode 100644 index 000000000..f7cfacbd4 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_report_white_36dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_block_grey600_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_block_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..01df2b52b --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_block_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_close_grey600_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_close_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7d1c061f7 --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_close_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e24919737 --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_question_mark.png b/InCallUI/res/drawable-xxxhdpi/ic_question_mark.png Binary files differnew file mode 100644 index 000000000..7ba34242c --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_question_mark.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_report_white_36dp.png b/InCallUI/res/drawable-xxxhdpi/ic_report_white_36dp.png Binary files differnew file mode 100644 index 000000000..7ef0d7afc --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_report_white_36dp.png diff --git a/InCallUI/res/drawable/spam_notification_icon.xml b/InCallUI/res/drawable/spam_notification_icon.xml new file mode 100644 index 000000000..c8bafe085 --- /dev/null +++ b/InCallUI/res/drawable/spam_notification_icon.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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item> + <shape android:shape="oval"> + <solid android:color="@color/blocked_contact_background" /> + <size android:width="@dimen/notification_large_icon_width" + android:height="@dimen/notification_large_icon_height" /> + </shape> + </item> + + <item android:drawable="@drawable/ic_report_white_36dp" android:gravity="center" /> + +</layer-list>
\ No newline at end of file diff --git a/InCallUI/res/drawable/unknown_notification_icon.xml b/InCallUI/res/drawable/unknown_notification_icon.xml new file mode 100644 index 000000000..85c50752c --- /dev/null +++ b/InCallUI/res/drawable/unknown_notification_icon.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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item> + <shape android:shape="oval"> + <solid android:color="@color/unknown_number_color" /> + <size android:width="@dimen/notification_large_icon_width" + android:height="@dimen/notification_large_icon_height" /> + </shape> + </item> + + <item android:drawable="@drawable/ic_question_mark" android:gravity="center" /> + +</layer-list>
\ No newline at end of file diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 71c7f0166..238d36033 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -127,4 +127,7 @@ <!-- White background for dialer --> <color name="background_dialer_white">#ffffff</color> + + <!-- Background color for large notification icon in after call from unknown numbers --> + <color name="unknown_number_color">#919191</color> </resources> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 5c24afc0d..a15a2ff3f 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -538,4 +538,17 @@ <string name="closed_now">Closed now</string> <!-- Label for spam call in primary info. [CHAR LIMIT=20] --> <string name="label_spam_caller">Suspected spam caller</string> + + <!-- Title for the notification to the user after a call from an unknown number ends. [CHAR LIMIT=100] --> + <string name="spam_notification_title">Call ended %1$s</string> + <!-- Text displayed in the notification to the user after a non-spam call ends. [CHAR LIMIT=100] --> + <string name="spam_notification_non_spam_call_text">This is the first time this number called you.</string> + <!-- Text displayed in the notification to the user after a spam call ends. [CHAR LIMIT=100] --> + <string name="spam_notification_spam_call_text">We suspected this call to be a spammer.</string> + <!-- Text for the reporting spam action in the after call prompt. [CHAR LIMIT=20] --> + <string name="spam_notification_report_spam_action_text">Block/report spam</string> + <!-- Text for the adding to contacts action in the after call prompt. [CHAR LIMIT=20] --> + <string name="spam_notification_add_contact_action_text">Add contact</string> + <!-- Text for the reporting as not spam action in the after call prompt. [CHAR LIMIT=20] --> + <string name="spam_notification_not_spam_action_text">Not spam</string> </resources> |