From fc0eb8ccebcc7846db5e8b5c5430070055679bfa Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 31 Aug 2017 06:57:16 -0700
Subject: Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)

This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):

  git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
  git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef

Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../incallui/res/values/animation_constants.xml    |  19 --
 java/com/android/incallui/res/values/colors.xml    |  20 --
 java/com/android/incallui/res/values/dimens.xml    |  26 ---
 java/com/android/incallui/res/values/strings.xml   | 202 ++-------------------
 java/com/android/incallui/res/values/styles.xml    |   2 -
 5 files changed, 18 insertions(+), 251 deletions(-)
 delete mode 100644 java/com/android/incallui/res/values/animation_constants.xml

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

diff --git a/java/com/android/incallui/res/values/animation_constants.xml b/java/com/android/incallui/res/values/animation_constants.xml
deleted file mode 100644
index ac50db21c..000000000
--- a/java/com/android/incallui/res/values/animation_constants.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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>
-  <integer name="reveal_animation_duration">333</integer>
-</resources>
diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml
index 0c73cdb10..4bded7855 100644
--- a/java/com/android/incallui/res/values/colors.xml
+++ b/java/com/android/incallui/res/values/colors.xml
@@ -16,27 +16,16 @@
   -->
 
 <resources>
-
-  <color name="incall_action_bar_background_color">@color/dialer_theme_color</color>
-  <color name="incall_action_bar_text_color">#ffffff</color>
-
-  <!-- Put on top of each photo, implying 80% darker than usual. -->
-  <color name="on_hold_dim_effect">#cc000000</color>
-
   <color name="conference_call_manager_caller_name_text_color">#4d4d4d</color>
   <color name="conference_call_manager_icon_color">#999999</color>
   <!-- Used with some smaller texts in manage conference screen. -->
   <color name="conference_call_manager_secondary_text_color">#999999</color>
 
   <color name="incall_dialpad_background">#ffffff</color>
-  <color name="incall_dialpad_background_pressed">#ccaaaaaa</color>
-  <color name="incall_window_scrim">#b2000000</color>
 
   <!-- Background color for status bar. For portrait this will be ignored. -->
   <color name="statusbar_background_color">@color/dialer_theme_color</color>
 
-  <color name="translucent_shadow">#33999999</color>
-
   <!-- 20% opacity, theme color. -->
   <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
 
@@ -69,15 +58,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>
-
-  <!-- Background color for large notification icon in after call from unknown numbers -->
-  <color name="unknown_number_color">#F4B400</color>
-
   <color name="incall_background_gradient_top">#E91141BB</color>
   <color name="incall_background_gradient_middle">#E91141BB</color>
   <color name="incall_background_gradient_bottom">#CC229FEB</color>
diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml
index 56b9ae158..93102812c 100644
--- a/java/com/android/incallui/res/values/dimens.xml
+++ b/java/com/android/incallui/res/values/dimens.xml
@@ -16,20 +16,6 @@
   -->
 
 <resources>
-  <dimen name="incall_action_bar_elevation">3dp</dimen>
-
-  <!-- Margin between the bottom of the "call card" photo
-       and the top of the in-call button cluster. -->
-  <dimen name="in_call_touch_ui_upper_margin">2dp</dimen>
-
-  <!-- Padding at the top and bottom edges of the "provider information" -->
-  <dimen name="provider_info_top_bottom_padding">8dp</dimen>
-
-  <!-- Right padding for name and number fields in the call banner.
-       This padding is used to ensure that ultra-long names or
-       numbers won't overlap the elapsed time indication. -->
-  <dimen name="call_banner_name_number_right_padding">50sp</dimen>
-
   <!-- The InCallUI dialpad will sometimes want digits sizes that are different
        from dialer. Note, these are the default sizes for small devices. Larger
        screen sizes apply the values in values-sw360dp/dimens.xml. -->
@@ -40,22 +26,10 @@
   <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen>
   <dimen name="incall_dialpad_key_numbers_size">36dp</dimen>
 
-  <!-- Dimensions for OTA Call Card -->
-  <dimen name="otaactivate_layout_marginTop">10dp</dimen>
-  <dimen name="otalistenprogress_layout_marginTop">5dp</dimen>
-  <dimen name="otasuccessfail_layout_marginTop">10dp</dimen>
-
   <!-- Dimension used to possibly down-scale high-res photo into what is suitable
        for notification's large icon. -->
   <dimen name="notification_icon_size">64dp</dimen>
 
-  <!-- Height of translucent shadow effect -->
-  <dimen name="translucent_shadow_height">2dp</dimen>
-
-  <!-- The smaller dimension of the video preview.  When in portrait orientation this is the
-       width of the preview.  When in landscape, this is the height. -->
-  <dimen name="video_preview_small_dimension">90dp</dimen>
-
   <dimen name="conference_call_manager_button_dimension">48dp</dimen>
 
   <dimen name="return_to_call_initial_offset_y">120dp</dimen>
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index 4113313df..177f38650 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -15,20 +15,12 @@
   ~ limitations under the License
   -->
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- Official label of the phone app, as seen in "Manage Applications"
        and other settings UIs. -->
   <string name="phoneAppLabel" product="default">Phone</string>
 
-  <!-- Official label for the in-call UI. DO NOT TRANSLATE. -->
-  <string name="inCallLabel" translate="false">InCallUI</string>
-
-  <!-- In-call screen: status label for a conference call -->
-  <string name="confCall">Conference call</string>
-  <!-- In-call screen: call lost dialog text -->
-  <string name="call_lost">Call dropped</string>
-
   <!-- MMI dialog strings -->
   <!-- Dialog label when an MMI code starts running -->
 
@@ -37,51 +29,34 @@
        the "wait" character in a phone number to be dialed; this dialog asks the
        user if it's OK to send the numbers following the "wait". -->
   <string name="wait_prompt_str">Send the following tones?\n</string>
-  <!-- In-call screen: body text of the dialog that appears when we encounter
-       the "PAUSE" character in a phone number to be dialed; this dialog gives
-       informative message to the user to show the sending numbers following the "Pause". -->
-  <string name="pause_prompt_str">Sending tones\n</string>
-  <!-- In-call screen: button label on the "wait" prompt dialog -->
-  <string name="send_button">Send</string>
   <!-- In-call screen: button label on the "wait" prompt dialog in CDMA Mode-->
   <string name="pause_prompt_yes">Yes</string>
   <!-- In-call screen: button label on the "wait" prompt dialog in CDMA Mode-->
   <string name="pause_prompt_no">No</string>
-  <!-- In-call screen: on the "wild" character dialog, this is the label
-       for a text widget that lets the user enter the digits that should
-       replace the "wild" character. -->
-  <string name="wild_prompt_str">Replace wild character with</string>
-
-  <!-- In-call screen: status label for a conference call -->
-  <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
-
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_phoneNumber_text" translatable="false">(650) 555-1234</string>
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_infoText_text" translatable="false">Incoming phone number</string>
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_placeCall_text" translatable="false">Fake Incoming Call</string>
-
-  <!-- Call settings screen, Set voicemail dialog title -->
-  <string name="voicemail_settings_number_label">Voicemail number</string>
 
   <!-- Notification strings -->
   <!-- The "label" of the in-call Notification for a dialing call, used
        as the format string for a Chronometer widget. [CHAR LIMIT=60] -->
   <string name="notification_dialing">Dialing</string>
-  <!-- Missed call notification message used for a single missed call, including
-       the caller-id info from the missed call -->
-  <string name="notification_missedCallTicker">Missed call from <xliff:g id="missed_call_from">%s</xliff:g></string>
   <!-- The "label" of the in-call Notification for an ongoing call. [CHAR LIMIT=60] -->
   <string name="notification_ongoing_call">Ongoing call</string>
   <!-- The "label" of the in-call Notification for an ongoing work call. [CHAR LIMIT=60] -->
   <string name="notification_ongoing_work_call">Ongoing work call</string>
-  <!-- The "label" of the in-call Notification for an ongoing call, which is being made over
-       Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_call_wifi">Ongoing Wi\u2011Fi call</string>
-  <!-- The "label" of the in-call Notification for an ongoing work call, which is being made
-       over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_work_call_wifi">Ongoing Wi\u2011Fi work call</string>
+
+  <!-- Template for the label on the in-call Notification for an ongoing call, which is being made
+      over Wi-Fi. The format argument is @string/notification_call_wifi_brand [CHAR LIMIT=20]-->
+  <string name="notification_ongoing_call_wifi_template">Ongoing <xliff:g id="brand_name">%1$s</xliff:g></string>
+
+  <!-- Template for the label of the in-call Notification for an incoming call, which is being made
+      over Wi-Fi. The format argument is @string/notification_call_wifi_brand [CHAR LIMIT=20] -->
+  <string name="notification_incoming_call_wifi_template">Incoming <xliff:g id="brand_name">%1$s</xliff:g></string>
+
+  <!-- "Brand name" for WiFi calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40]-->
+  <string name="notification_call_wifi_brand">Wi\u2011Fi call</string>
+
+  <!-- "Brand name" for WiFi work calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_work_brand">Wi\u2011Fi work call</string>
+
   <!-- The "label" of the in-call Notification for a call that's on hold -->
   <string name="notification_on_hold">On hold</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
@@ -124,21 +99,10 @@
 
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
   <string name="notification_incoming_work_call">Incoming work call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_call_wifi">Incoming Wi\u2011Fi call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing work call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_work_call_wifi">Incoming Wi\u2011Fi work call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing spam call. -->
   <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
   <!-- The "label" of the in-call Notification for upgrading an existing call to a video call. -->
   <string name="notification_requesting_video_call">Incoming video request</string>
-  <!-- Label for the "No service" notification item, when expanded. -->
-  <string name="notification_network_selection_title">No service</string>
-  <!-- Label for the expanded "No service" notification item, including the
-       operator name set by user -->
-  <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string>
   <!-- Label for the "Answer call" action. This is the displayed label for the action that answers
        an incoming call. [CHAR LIMIT=12] -->
   <string name="notification_action_answer">Answer</string>
@@ -150,9 +114,6 @@
   <!-- Label for "Video Call" notification action. This is a displayed on the notification for an
        incoming video call, and answers the call as a video call. [CHAR LIMIT=12] -->
   <string name="notification_action_answer_video">Video</string>
-  <!-- Label for "Voice" notification action. This is a displayed on the notification for an
-       incoming video call, and answers the call as an audio call. [CHAR LIMIT=12] -->
-  <string name="notification_action_answer_voice">Voice</string>
   <!-- Label for "Accept" notification action. This is somewhat generic, and may refer to
        scenarios such as accepting an incoming call or accepting a video call request.
        [CHAR LIMIT=12] -->
@@ -184,62 +145,9 @@
        video call to the current device.
        [CHAR LIMIT=30] -->
   <string name="notification_take_video_call">Take Video Call</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_power_off">To place a call, first turn off Airplane mode.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog.
-       This string is currently unused (see comments in InCallActivity.java.) -->
-  <string name="incall_error_emergency_only">Not registered on network.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_out_of_service">Mobile network not available.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_no_phone_number_supplied">To place a call, enter a valid number.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_call_failed">Can\'t call.</string>
-  <!-- In-call screen: status message displayed in a dialog when starting an MMI -->
-  <string name="incall_status_dialed_mmi">Starting MMI sequence\u2026</string>
+
   <!-- In-call screen: message displayed in an error dialog -->
   <string name="incall_error_supp_service_unknown">Service not supported.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_switch">Can\'t switch calls.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_separate">Can\'t separate call.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_transfer">Can\'t transfer.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_conference">Can\'t conference.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_reject">Can\'t reject call.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_hangup">Can\'t release call(s).</string>
-
-  <!-- Dialog title for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_title">Emergency call</string>
-  <!-- Status message for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_message">Turning on radio\u2026</string>
-  <!-- Status message for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_retry">No service. Trying again\u2026</string>
-
-  <!-- Dialer text on Emergency Dialer -->
-  <!-- Emergency dialer: message displayed in an error dialog -->
-  <string name="dial_emergency_error">Can\'t call. <xliff:g id="non_emergency_number">%s</xliff:g> is not an emergency number.</string>
-  <!-- Emergency dialer: message displayed in an error dialog -->
-  <string name="dial_emergency_empty_error">Can\'t call. Dial an emergency number.</string>
-
-  <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
-       to dial using the physical keyboard -->
-  <string name="dialerKeyboardHintText">Use keyboard to dial</string>
-
-  <!-- Message indicating that Video Started flowing for IMS-VT calls -->
-  <string name="player_started">Player Started</string>
-  <!-- Message indicating that Video Stopped flowing for IMS-VT calls -->
-  <string name="player_stopped">Player Stopped</string>
-  <!-- Message indicating that camera failure has occurred for the selected camera and
-       as result camera is not ready -->
-  <string name="camera_not_ready">Camera not ready</string>
-  <!-- Message indicating that camera is ready/available -->
-  <string name="camera_ready">Camera ready</string>
-  <!-- Message indicating unknown call session event -->
-  <string name="unknown_call_session_event">"Unkown call session event"</string>
 
   <!-- For incoming calls, this is a string we can get from a CDMA network instead of
        the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
@@ -248,21 +156,11 @@
     <item>ABSENTNUMBER</item>
   </string-array>
 
-  <!-- Title displayed above settings coming after voicemail in the call features screen -->
-  <string name="other_settings">Other call settings</string>
-
   <!-- Use this to describe the separate conference call button; currently for screen readers through accessibility. -->
   <string name="goPrivate">go private</string>
-  <!--  Use this to describe the select contact button in EditPhoneNumberPreference; currently for screen readers through accessibility. -->
-  <string name="selectContact">select contact</string>
-
-  <!-- Title for the category "ringtone", which is shown above ringtone and vibration
-       related settings.
-       [CHAR LIMIT=30] -->
-  <string name="preference_category_ringtone">Ringtone &amp; Vibrate</string>
 
   <!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
-  <string name="manageConferenceLabel">Manage conference call</string>
+  <string name="manageConferenceLabel" tools:ignore="UnusedResources">Manage conference call</string>
 
   <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">Emergency number</string>
@@ -271,72 +169,8 @@
       phone number associated with their device. [CHAR LIMIT=16] -->
   <string name="child_number">via <xliff:g example="650-555-1212" id="child_number">%s</xliff:g></string>
 
-  <!-- Title for the call context with a person-type contact. [CHAR LIMIT=40] -->
-  <string name="person_contact_context_title">Recent messages</string>
-
-  <!-- Title for the call context with a business-type contact. [CHAR LIMIT=40] -->
-  <string name="business_contact_context_title">Business info</string>
-
   <!-- Distance strings for business caller ID context. -->
 
-  <!-- Used to inform the user how far away a location is in miles. [CHAR LIMIT=NONE] -->
-  <string name="distance_imperial_away"><xliff:g id="distance">%.1f</xliff:g> mi away</string>
-  <!-- Used to inform the user how far away a location is in kilometers. [CHAR LIMIT=NONE] -->
-  <string name="distance_metric_away"><xliff:g id="distance">%.1f</xliff:g> km away</string>
-  <!-- A shortened way to display a business address. Formatted [street address], [city/locality]. -->
-  <string name="display_address"><xliff:g id="street_address">%1$s</xliff:g>, <xliff:g id="locality">%2$s</xliff:g></string>
-  <!-- Used to indicate hours of operation for a location as a time span. e.g. "11 am - 9 pm" [CHAR LIMIT=NONE] -->
-  <string name="open_time_span"><xliff:g id="open_time">%1$s</xliff:g> - <xliff:g id="close_time">%2$s</xliff:g></string>
-  <!-- Used to indicate a series of opening hours for a location.
-       This first argument may be one or more time spans. e.g. "11 am - 9 pm, 9 pm - 11 pm"
-       The second argument is an additional time span. e.g. "11 pm - 1 am"
-       The string is used to build a list of opening hours.
-       [CHAR LIMIT=NONE] -->
-  <string name="opening_hours"><xliff:g id="earlier_times">%1$s</xliff:g>, <xliff:g id="later_time">%2$s</xliff:g></string>
-  <!-- Used to express when a location will open the next day. [CHAR LIMIT=NONE] -->
-  <string name="opens_tomorrow_at">Opens tomorrow at <xliff:g id="open_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location will be open today. [CHAR LIMIT=NONE] -->
-  <string name="opens_today_at">Opens today at <xliff:g id="open_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location will close today. [CHAR LIMIT=NONE] -->
-  <string name="closes_today_at">Closes at <xliff:g id="close_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location closed today if it is already closed. [CHAR LIMIT=NONE] -->
-  <string name="closed_today_at">Closed today at <xliff:g id="close_time">%s</xliff:g></string>
-  <!-- Displayed when a place is open. -->
-  <string name="open_now">Open now</string>
-  <!-- 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>
diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml
index 3c036c95f..5f1aefda1 100644
--- a/java/com/android/incallui/res/values/styles.xml
+++ b/java/com/android/incallui/res/values/styles.xml
@@ -16,8 +16,6 @@
   -->
 
 <resources>
-  <drawable name="grayBg">#FF333333</drawable>
-
   <!-- Theme for the InCallActivity activity. Should have a transparent background for the
        circular reveal animation for a new outgoing call to work correctly. We don't just use
        Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
-- 
cgit v1.2.3