From 24dbc840985b12a8e61e6e190e8508c72d58bcae Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 29 Aug 2017 21:58:45 -0700
Subject: Make incallui/spam a standalone build target

Previously incallui/spam was being built directly into the incallui
build target. With this CL it's now a standalone build target.

This change should make it easier to test spam notifications.

Bug: 62937258
Test: N/A
Change-Id: I5f238ed7f9a4eaaff4b2a325479d2b6de19bdf07
PiperOrigin-RevId: 165479077
---
 .../res/drawable-hdpi/ic_block_grey600_24dp.png    | Bin 518 -> 0 bytes
 .../res/drawable-hdpi/ic_call_end_white_24dp.png   | Bin 454 -> 0 bytes
 .../res/drawable-hdpi/ic_close_grey600_24dp.png    | Bin 225 -> 0 bytes
 .../drawable-hdpi/ic_person_add_grey600_24dp.png   | Bin 300 -> 0 bytes
 .../res/drawable-mdpi/ic_block_grey600_24dp.png    | Bin 348 -> 0 bytes
 .../res/drawable-mdpi/ic_call_end_white_24dp.png   | Bin 315 -> 0 bytes
 .../res/drawable-mdpi/ic_close_grey600_24dp.png    | Bin 178 -> 0 bytes
 .../drawable-mdpi/ic_person_add_grey600_24dp.png   | Bin 211 -> 0 bytes
 .../res/drawable-xhdpi/ic_block_grey600_24dp.png   | Bin 690 -> 0 bytes
 .../res/drawable-xhdpi/ic_call_end_white_24dp.png  | Bin 534 -> 0 bytes
 .../res/drawable-xhdpi/ic_close_grey600_24dp.png   | Bin 261 -> 0 bytes
 .../drawable-xhdpi/ic_person_add_grey600_24dp.png  | Bin 341 -> 0 bytes
 .../res/drawable-xxhdpi/ic_block_grey600_24dp.png  | Bin 1029 -> 0 bytes
 .../res/drawable-xxhdpi/ic_call_end_white_24dp.png | Bin 736 -> 0 bytes
 .../res/drawable-xxhdpi/ic_close_grey600_24dp.png  | Bin 353 -> 0 bytes
 .../drawable-xxhdpi/ic_person_add_grey600_24dp.png | Bin 485 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_block_grey600_24dp.png | Bin 1353 -> 0 bytes
 .../drawable-xxxhdpi/ic_call_end_white_24dp.png    | Bin 929 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_close_grey600_24dp.png | Bin 444 -> 0 bytes
 .../ic_person_add_grey600_24dp.png                 | Bin 638 -> 0 bytes
 .../res/drawable/spam_notification_icon.xml        |  34 ---------------------
 .../incallui/res/layout/caller_in_conference.xml   |   2 +-
 java/com/android/incallui/res/values/colors.xml    |   3 --
 java/com/android/incallui/res/values/strings.xml   |  31 -------------------
 24 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png
 delete mode 100644 java/com/android/incallui/res/drawable/spam_notification_icon.xml

(limited to 'java/com/android/incallui/res')

diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 1e9294c12..000000000
Binary files a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index 757d339c4..000000000
Binary files a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 9ab350e9a..000000000
Binary files a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index 185d03393..000000000
Binary files a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index edd666b73..000000000
Binary files a/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index 17eb4824e..000000000
Binary files a/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 73faf52eb..000000000
Binary files a/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index ec3237086..000000000
Binary files a/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 36210a8cb..000000000
Binary files a/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index b00d82edd..000000000
Binary files a/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index a3896c5c6..000000000
Binary files a/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index e56481ed7..000000000
Binary files a/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 9f5120373..000000000
Binary files a/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index aeabe4a81..000000000
Binary files a/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 22d7aa55e..000000000
Binary files a/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index c17dfe05f..000000000
Binary files a/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 01df2b52b..000000000
Binary files a/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index a6e8a7bc1..000000000
Binary files a/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 7d1c061f7..000000000
Binary files a/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index e24919737..000000000
Binary files a/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png and /dev/null differ
diff --git a/java/com/android/incallui/res/drawable/spam_notification_icon.xml b/java/com/android/incallui/res/drawable/spam_notification_icon.xml
deleted file mode 100644
index a414428cb..000000000
--- a/java/com/android/incallui/res/drawable/spam_notification_icon.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/incall_call_spam_background_color"/>
-      <size
-        android:height="@android:dimen/notification_large_icon_height"
-        android:width="@android:dimen/notification_large_icon_width"/>
-    </shape>
-  </item>
-
-  <item
-    android:drawable="@drawable/quantum_ic_report_white_36"
-    android:gravity="center"/>
-
-</layer-list>
diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml
index 3a6773d20..4f4b2f043 100644
--- a/java/com/android/incallui/res/layout/caller_in_conference.xml
+++ b/java/com/android/incallui/res/layout/caller_in_conference.xml
@@ -113,7 +113,7 @@
     android:clickable="true"
     android:contentDescription="@string/conference_caller_disconnect_content_description"
     android:scaleType="center"
-    android:src="@drawable/ic_call_end_white_24dp"
+    android:src="@drawable/quantum_ic_call_end_white_24"
     android:tint="@color/conference_call_manager_icon_color"/>
 
 </LinearLayout>  <!-- End of single list element -->
diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml
index 0c73cdb10..5d97d729f 100644
--- a/java/com/android/incallui/res/values/colors.xml
+++ b/java/com/android/incallui/res/values/colors.xml
@@ -69,9 +69,6 @@
     <item>#841F10</item>
   </array>
 
-  <!-- Background color for spam. This color must match one of background_colors above. -->
-  <color name="incall_call_spam_background_color">@color/blocked_contact_background</color>
-
   <!-- Ripple color used over light backgrounds. -->
   <color name="ripple_light">#40000000</color>
 
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index 22c3c23cc..8d6940ed8 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -309,37 +309,6 @@
   <!-- Displayed when a place is closed. -->
   <string name="closed_now">Closed now</string>
 
-  <!-- Title for the notification to the user after a call from an unknown number ends. [CHAR LIMIT=100] -->
-  <string name="non_spam_notification_title">Know <xliff:g id="number">%1$s</xliff:g>?</string>
-  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_title">Is <xliff:g id="number">%1$s</xliff:g> spam?</string>
-  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
-  <string name="spam_notification_block_report_toast_text"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as spam.</string>
-  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
-  <string name="spam_notification_not_spam_toast_text">Call from <xliff:g id="number">%1$s</xliff:g> reported as not spam.</string>
-  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
-  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
-  <string name="spam_notification_non_spam_call_expanded_text">This is the first time this number called you. If this call was spam, you can block this number and report it.</string>
-  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_spam_call_collapsed_text">Tap to report as NOT SPAM, or block it.</string>
-  <!-- Text displayed in the expanded notification to the user after a spam call ends. [CHAR LIMIT=NONE] -->
-  <string name="spam_notification_spam_call_expanded_text">We suspected this to be a spammer. If this call wasn\'t spam, tap "NOT SPAM" to report our mistake.</string>
-  <!-- Text for the reporting spam action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_report_spam_action_text">Block &amp; report</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>
-  <!-- Text for the blocking spam action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_block_spam_action_text">Block number</string>
-  <!-- Text for the adding to contacts action in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
-  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
-  <!-- Text for the marking a call as not spam in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_was_not_spam_action_text">Not spam</string>
-
   <string name="callFailed_simError">No SIM or SIM error</string>
 
   <string name="conference_caller_disconnect_content_description">End call</string>
-- 
cgit v1.2.3