From 2ca4318cc1ee57dda907ba2069bd61d162b1baef 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.

Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../android/incallui/res/values-en-rGB/strings.xml | 82 +++-------------------
 1 file changed, 8 insertions(+), 74 deletions(-)

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

diff --git a/java/com/android/incallui/res/values-en-rGB/strings.xml b/java/com/android/incallui/res/values-en-rGB/strings.xml
index 5e0d20737..7384519f4 100644
--- a/java/com/android/incallui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-en-rGB/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conference call"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Call dropped"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sending tones\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Replace wild character with"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Voicemail number"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Can\'t switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Can\'t separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Can\'t transfer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Can\'t conference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Can\'t reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Can\'t release call(s)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Emergency call"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No service. Trying again…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Can\'t call. Dial an emergency number."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use keyboard to dial"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player Started"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player Stopped"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera not ready"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera ready"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Unknown call session event"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Other call settings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="selectContact" msgid="1703433172800564849">"select contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringtone &amp; vibrate"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Recent messages"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Business info"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi away"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km away"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Opens tomorrow at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Opens today at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Closes at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Closed today at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Open now"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Closed now"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"We suspected this of being a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Not spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
-- 
cgit v1.2.3