diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/app/res/values | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
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
Diffstat (limited to 'java/com/android/dialer/app/res/values')
6 files changed, 16 insertions, 428 deletions
diff --git a/java/com/android/dialer/app/res/values/animation_constants.xml b/java/com/android/dialer/app/res/values/animation_constants.xml index 91230cd54..4029e772d 100644 --- a/java/com/android/dialer/app/res/values/animation_constants.xml +++ b/java/com/android/dialer/app/res/values/animation_constants.xml @@ -16,15 +16,4 @@ --> <resources> <integer name="fade_duration">300</integer> - - <!-- Swipe constants --> - <integer name="swipe_escape_velocity">100</integer> - <integer name="escape_animation_duration">200</integer> - <integer name="max_escape_animation_duration">400</integer> - <integer name="max_dismiss_velocity">2000</integer> - <integer name="snap_animation_duration">350</integer> - <integer name="swipe_scroll_slop">2</integer> - <dimen name="min_swipe">0dip</dimen> - <dimen name="min_vert">10dip</dimen> - <dimen name="min_lock">20dip</dimen> </resources> diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index 2f6d87b49..f1f5002ed 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -15,9 +15,6 @@ --> <resources> - <color name="dialer_red_highlight_color">#ff1744</color> - - <color name="dialer_button_text_color">#fff</color> <color name="dialer_flat_button_text_color">@color/dialer_theme_color</color> <!-- Color for the setting text. --> @@ -26,7 +23,6 @@ <color name="setting_secondary_color">@color/dialer_secondary_text_color</color> <color name="setting_disabled_color">#aaaaaa</color> <color name="setting_background_color">#ffffff</color> - <color name="setting_button_color">#eee</color> <!-- 54% black --> <color name="call_log_icon_tint">#8a000000</color> @@ -36,6 +32,8 @@ <color name="call_log_detail_color">#8a000000</color> <!-- 87% black --> <color name="call_log_voicemail_transcript_color">#de000000</color> + <!-- 54% black --> + <color name="call_log_voicemail_transcript_branding_color">#8a000000</color> <!-- 70% black --> <color name="call_log_action_color">#b3000000</color> <!-- 54% black --> @@ -54,35 +52,19 @@ <!-- Background color for search results and call details --> <color name="background_dialer_results">#f9f9f9</color> - <color name="background_dialer_call_log">@color/background_dialer_light</color> - - <!-- Color of the 1dp divider that separates favorites --> - <color name="favorite_contacts_separator_color">#d0d0d0</color> <!-- Color of the contact name in favorite tiles --> <color name="contact_tile_name_color">#ffffff</color> <color name="contact_list_name_text_color">@color/dialer_primary_text_color</color> - <!-- Undo dialogue color --> - <color name="undo_dialogue_text_color">#4d4d4d</color> - <color name="remove_text_color">#ffffff</color> <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view --> <color name="remove_highlighted_text_color">#FF3F3B</color> - <!-- Color of the bottom border below the contacts grid on the main dialer screen. --> - <color name="contacts_grid_bottom_border_color">#16000000</color> - - <!-- Color of actions in expanded call log entries. This text color represents actions such - as call back, play voicemail, etc. --> - <color name="call_log_action_text">@color/dialer_theme_color</color> - <color name="dialer_dialpad_touch_tint">@color/dialer_theme_color_20pct</color> - <color name="floating_action_button_touch_tint">#80ffffff</color> - <color name="call_log_action_divider">#eeeeee</color> <color name="divider_line_color">#D8D8D8</color> @@ -93,11 +75,7 @@ <color name="blocked_number_background">#FFFFFF</color> <color name="blocked_number_block_color">#F44336</color> <color name="blocked_number_header_color">@color/dialer_theme_color</color> - <color name="blocked_number_disabled_emergency_header_color">#616161</color> <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color> <color name="add_blocked_number_icon_color">#bdbdbd</color> - <!-- Grey 700 --> - <color name="call_detail_footer_text_color">#616161</color> - <color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color> </resources> diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml index 90a8bb879..5f252ee89 100644 --- a/java/com/android/dialer/app/res/values/dimens.xml +++ b/java/com/android/dialer/app/res/values/dimens.xml @@ -14,9 +14,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <dimen name="button_horizontal_padding">16dp</dimen> - <dimen name="divider_line_thickness">1dp</dimen> <!-- Drag to remove view (in dp because it is used in conjunction with a statically @@ -31,40 +30,15 @@ <!-- Call Log --> <dimen name="call_log_horizontal_margin">8dp</dimen> - <dimen name="call_log_call_action_size">32dp</dimen> - <dimen name="call_log_call_action_width">54dp</dimen> - <dimen name="call_log_inner_margin">13dp</dimen> <dimen name="call_log_outer_margin">8dp</dimen> <dimen name="call_log_start_margin">8dp</dimen> - <dimen name="call_log_indent_margin">24dp</dimen> <dimen name="call_log_name_margin_bottom">2dp</dimen> <dimen name="call_log_call_account_margin_bottom">2dp</dimen> <dimen name="call_log_vertical_padding">8dp</dimen> - <dimen name="call_log_list_item_height">56dp</dimen> <dimen name="call_log_list_item_info_margin_start">16dp</dimen> - <dimen name="show_call_history_list_item_height">72dp</dimen> <!-- Size of contact photos in the call log and call details. --> <dimen name="contact_photo_size">48dp</dimen> - <dimen name="call_detail_button_spacing">2dip</dimen> - <dimen name="call_detail_horizontal_margin">20dp</dimen> - <dimen name="call_detail_top_margin">16dp</dimen> - <dimen name="call_detail_bottom_margin">16dp</dimen> - <dimen name="call_detail_header_top_margin">20dp</dimen> - <dimen name="call_detail_header_bottom_margin">9dp</dimen> - <dimen name="call_detail_elevation">0.5dp</dimen> - <dimen name="call_detail_action_item_padding_horizontal">28dp</dimen> - <dimen name="call_detail_action_item_padding_vertical">16dp</dimen> - <dimen name="call_detail_action_item_drawable_padding">28dp</dimen> - <dimen name="call_detail_action_item_text_size">16sp</dimen> - <dimen name="transcription_top_margin">18dp</dimen> - <dimen name="transcription_bottom_margin">18dp</dimen> - - <!-- Size of call provider icon width and height --> - <dimen name="call_provider_small_icon_size">12dp</dimen> - - <!-- Match call_button_height to Phone's dimens/in_call_end_button_height --> - <dimen name="call_button_height">74dp</dimen> <!-- Dimensions for speed dial tiles --> <dimen name="contact_tile_divider_width">1dp</dimen> @@ -73,20 +47,14 @@ <dimen name="contact_tile_text_side_padding">12dp</dimen> <dimen name="contact_tile_text_bottom_padding">9dp</dimen> <dimen name="favorites_row_top_padding">1dp</dimen> - <dimen name="favorites_row_bottom_padding">0dp</dimen> <dimen name="favorites_row_start_padding">1dp</dimen> <!-- Padding from the last contact tile will provide the end padding. --> <dimen name="favorites_row_end_padding">0dp</dimen> - <dimen name="favorites_row_undo_text_side_padding">32dp</dimen> <!-- Size of the star icon on the favorites tile. --> <dimen name="favorites_star_icon_size">12dp</dimen> - <!-- Padding for the tooltip --> - <dimen name="dismiss_button_padding_start">20dip</dimen> - <dimen name="dismiss_button_padding_end">28dip</dimen> - <!-- Margin to the left and right of the search box. --> <dimen name="search_margin_horizontal">8dp</dimen> <!-- Margin above the search box. --> @@ -103,19 +71,6 @@ <dimen name="search_list_padding_top">16dp</dimen> <dimen name="search_box_elevation">3dp</dimen> - <!-- Padding for icons to increase their touch target. Icons are typically 24 dps in size - so this extra padding makes the entire touch target 40dp --> - <dimen name="icon_padding">8dp</dimen> - - <!-- Length of dialpad's shadows in dialer. --> - <dimen name="shadow_length">10dp</dimen> - - <!-- Dimensions for individual preference cards --> - <dimen name="preference_padding_top">16dp</dimen> - <dimen name="preference_padding_bottom">16dp</dimen> - <dimen name="preference_side_margin">16dp</dimen> - <dimen name="preference_summary_line_spacing_extra">4dp</dimen> - <dimen name="call_log_list_item_primary_action_dimen">48dp</dimen> <!-- Dimensions for promo cards --> @@ -139,9 +94,7 @@ <dimen name="blocked_number_add_top_margin">8dp</dimen> <dimen name="blocked_number_add_bottom_margin">8dp</dimen> <dimen name="blocked_number_primary_text_size">16sp</dimen> - <dimen name="blocked_number_secondary_text_size">12sp</dimen> <dimen name="blocked_number_delete_icon_size">32dp</dimen> <dimen name="blocked_number_search_text_size">14sp</dimen> <dimen name="blocked_number_settings_description_text_size">14sp</dimen> - <dimen name="blocked_number_header_height">48dp</dimen> </resources> diff --git a/java/com/android/dialer/app/res/values/donottranslate_config.xml b/java/com/android/dialer/app/res/values/donottranslate_config.xml deleted file mode 100644 index e7a8e6fc3..000000000 --- a/java/com/android/dialer/app/res/values/donottranslate_config.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2012 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> - - <!-- If true, enable vibration (haptic feedback) for dialer key presses. - The pattern is set on a per-platform basis using config_virtualKeyVibePattern. - TODO: If enough users are annoyed by this, we might eventually - need to make it a user preference rather than a per-platform - resource. --> - <bool name="config_enable_dialer_key_vibration">true</bool> - - <!-- If true, show an onscreen "Dial" button in the dialer. - In practice this is used on all platforms even the ones with hard SEND/END - keys, but for maximum flexibility it's controlled by a flag here - (which can be overridden on a per-product basis.) --> - <bool name="config_show_onscreen_dial_button">true</bool> - - <!-- Regular expression for prohibiting certain phone numbers in dialpad. - Ignored if empty. --> - <string name="config_prohibited_phone_number_regexp"></string> - -</resources> diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 5549881c3..50e717492 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -16,21 +16,14 @@ --> -<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"> <!-- Application name used in Settings/Apps. Default label for activities that don't specify a label. --> - <string name="applicationLabel">Phone</string> + <string name="applicationLabel" tools:ignore="UnusedResources">Phone</string> <!-- Title for the activity that dials the phone, when launched directly into the dialpad --> <string name="launcherDialpadActivityLabel">Phone Keypad</string> - <!-- The description text for the dialer tab. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - - [CHAR LIMIT=NONE] --> - <string name="dialerIconLabel">Phone</string> <!-- The description text for the call log tab. @@ -38,10 +31,7 @@ This is especially valuable for views without textual representation like ImageView. [CHAR LIMIT=NONE] --> - <string name="callHistoryIconLabel">Call history</string> - - <!-- Text for a menu item to report a call as having been incorrectly identified. [CHAR LIMIT=48] --> - <string name="action_report_number">Report inaccurate number</string> + <string name="callHistoryIconLabel" tools:ignore="UnusedResources">Call history</string> <!-- Option displayed in context menu to copy long pressed phone number. [CHAR LIMIT=48] --> <string name="action_copy_number_text">Copy number</string> @@ -49,12 +39,6 @@ <!-- Option displayed in context menu to copy long pressed voicemail transcription. [CHAR LIMIT=48] --> <string name="copy_transcript_text">Copy transcription</string> - <!-- Label for action to block a number. [CHAR LIMIT=48] --> - <string name="action_block_number">Block number</string> - - <!-- Label for action to unblock a number [CHAR LIMIT=48]--> - <string name="action_unblock_number">Unblock number</string> - <!-- Label for action to edit a number before calling it. [CHAR LIMIT=48] --> <string name="action_edit_number_before_call">Edit number before call</string> @@ -79,10 +63,6 @@ <!-- Title of the "Clearing call log" progress-dialog [CHAR LIMIT=35] --> <string name="clearCallLogProgress_title">Clearing call history\u2026</string> - <!-- Title used for the activity for placing a call. This name appears - in activity disambig dialogs --> - <string name="userCallActivityLabel" product="default">Phone</string> - <!-- Notification strings --> <!-- Missed call notification label, used when there's exactly one missed call --> <string name="notification_missedCallTitle">Missed call</string> @@ -120,9 +100,6 @@ </item> </plurals> - <!-- Used in the notification of a new voicemail for the action to play the voicemail. --> - <string name="notification_action_voicemail_play">Play</string> - <!-- Used to build a list of names or phone numbers, to indicate the callers who left voicemails. The first argument may be one or more callers, the most recent ones. @@ -146,54 +123,14 @@ <!-- Message to display whilst we are waiting for the content to be fetched. [CHAR LIMIT=40] --> <string name="voicemail_fetching_content">Loading voicemail\u2026</string> - <!-- Message to display whilst we are waiting for the content to be archived. [CHAR LIMIT=40] --> - <string name="voicemail_archiving_content">Archiving voicemail\u2026</string> - <!-- Message to display if we fail to get content within a suitable time period. [CHAR LIMIT=40] --> <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string> - <!-- The header to show that call log is only showing voicemail calls. [CHAR LIMIT=40] --> - <string name="call_log_voicemail_header">Calls with voicemail only</string> - - <!-- The header to show that call log is only showing incoming calls. [CHAR LIMIT=40] --> - <string name="call_log_incoming_header">Incoming calls only</string> - - <!-- The header to show that call log is only showing outgoing calls. [CHAR LIMIT=40] --> - <string name="call_log_outgoing_header">Outgoing calls only</string> - - <!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] --> - <string name="call_log_missed_header">Missed calls only</string> - <!-- The counter for calls in a group and the date of the latest call as shown in the call log [CHAR LIMIT=15] --> <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>) <xliff:g id="date">%2$s</xliff:g> </string> - <!-- String describing the Search ImageButton - - Used by AccessibilityService to announce the purpose of the button. - [CHAR LIMIT=NONE] - --> - <string name="description_search_button">search</string> - - <!-- String describing the Dial ImageButton - - Used by AccessibilityService to announce the purpose of the button. - --> - <string name="description_dial_button">dial</string> - - <!-- String describing the digits text box containing the number to dial. - - Used by AccessibilityService to announce the purpose of the view. - --> - <string name="description_digits_edittext">number to dial</string> - - <!-- String describing the button in the voicemail playback to start/stop playback. - - Used by AccessibilityService to announce the purpose of the view. - --> - <string name="description_playback_start_stop">Play or stop playback</string> - <!-- String describing the button in the voicemail playback to switch on/off speakerphone. Used by AccessibilityService to announce the purpose of the view. @@ -206,18 +143,6 @@ --> <string name="description_playback_seek">Seek playback position</string> - <!-- String describing the button in the voicemail playback to decrease playback rate. - - Used by AccessibilityService to announce the purpose of the view. - --> - <string name="description_rate_decrease">Decrease playback rate</string> - - <!-- String describing the button in the voicemail playback to increase playback rate. - - Used by AccessibilityService to announce the purpose of the view. - --> - <string name="description_rate_increase">Increase playback rate</string> - <!-- Content description for the fake action menu button that brings up the call history activity --> <string name="action_menu_call_history_description">Call history</string> @@ -232,25 +157,6 @@ [CHAR LIMIT=NONE] --> <string name="action_menu_dialpad_button">key pad</string> - <!-- Menu item used to show only outgoing in the call log. [CHAR LIMIT=30] --> - <string name="menu_show_outgoing_only">Show outgoing only</string> - - <!-- Menu item used to show only incoming in the call log. [CHAR LIMIT=30] --> - <string name="menu_show_incoming_only">Show incoming only</string> - - <!-- Menu item used to show only missed in the call log. [CHAR LIMIT=30] --> - <string name="menu_show_missed_only">Show missed only</string> - - <!-- Menu item used to show only voicemails in the call log. [CHAR LIMIT=30] --> - <string name="menu_show_voicemails_only">Show voicemails only</string> - - <!-- Menu item used to show all calls in the call log. [CHAR LIMIT=30] --> - <string name="menu_show_all_calls">Show all calls</string> - - <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] --> - <string name="add_2sec_pause">Add 2-sec pause</string> - <string name="add_wait">Add wait</string> - <!-- Label for the dialer app setting page [CHAR LIMIT=30]--> <string name="dialer_settings_label">Settings</string> @@ -261,27 +167,6 @@ <!-- Label for the menu item that installs a shortcut for the new UI. [CHAR LIMIT=30] --> <string name="new_ui_launcher_shortcut_label">Create New UI Shortcut</string> - <!-- Menu item to display all contacts [CHAR LIMIT=30] --> - <string name="menu_allContacts">All contacts</string> - - <!-- Item label: jump to the in-call DTMF dialpad. - (Part of a list of options shown in the dialer when another call - is already in progress.) --> - <string name="dialer_useDtmfDialpad">Use touch tone keypad</string> - - <!-- Item label: jump to the in-call UI. - (Part of a list of options shown in the dialer when another call - is already in progress.) --> - <string name="dialer_returnToInCallScreen">Return to call in progress</string> - - <!-- Item label: use the Dialer's keypad to add another call. - (Part of a list of options shown in the dialer when another call - is already in progress.) --> - <string name="dialer_addAnotherCall">Add call</string> - - <!-- Description for incoming calls going to voice mail vs. not --> - <string name="actionIncomingCall">Incoming calls</string> - <!-- String describing the user entering bulk action mode. Note: AccessibilityServices use this attribute to announce what the view represents. @@ -310,27 +195,6 @@ --> <string name="description_unselecting_bulk_action_mode">Unselected <xliff:g id="nameOrNumber">%1$s</xliff:g></string> - <!-- String describing the icon in the call log used to play a voicemail. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_call_log_play_button">Play voicemail</string> - - <!-- String describing the button to view the contact for the current number. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_view_contact">View contact <xliff:g id="name">%1$s</xliff:g></string> - - <!-- String describing the button to call a number or contact. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_call">Call <xliff:g id="name">%1$s</xliff:g></string> - <!-- String describing the button to access the contact details for a name or number. Note: AccessibilityServices use this attribute to announce what the view represents. @@ -361,38 +225,12 @@ --> <string name="description_video_call">Video call.</string> - <!-- String describing the button to SMS a number or contact. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - [CHAR LIMIT=NONE] - --> - <string name="description_send_text_message">Send SMS to <xliff:g id="name">%1$s</xliff:g></string> - - <!-- String describing the icon in the call log used to represent an unheard voicemail left to - the user. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - [CHAR LIMIT=NONE] - --> - <string name="description_call_log_unheard_voicemail">Unheard voicemail</string> - <!-- String describing the icon used to start a voice search --> <string name="description_start_voice_search">Start voice search</string> - <!-- Menu item used to call a contact, containing the number of the contact to call --> - <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string> - <!-- String used for displaying calls to the voicemail number in the call log --> <string name="voicemail">Voicemail</string> - <!-- A nicely formatted call duration displayed when viewing call details for duration less than 1 minute. For example "28 sec" --> - <string name="callDetailsShortDurationFormat"><xliff:g example="28" id="seconds">%s</xliff:g> sec</string> - - <!-- A nicely formatted call duration displayed when viewing call details. For example "42 min 28 sec" --> - <string name="callDetailsDurationFormat"><xliff:g example="42" id="minutes">%s</xliff:g> min <xliff:g example="28" id="seconds">%s</xliff:g> sec</string> - <!-- String describing the cancel button in multi select. Note: AccessibilityServices uses this attribute to announce what the view represents. [CHAR LIMIT=NONE] --> @@ -400,7 +238,6 @@ <string name="voicemailMultiSelectDeleteConfirm">Delete</string> <string name="voicemailMultiSelectDeleteCancel">Cancel</string> - <string name="voicemailMultiSelectDialogTitle">Delete selected <xliff:g id="voicemailorvoicemails">%1$s</xliff:g>?</string> <string name="voicemailMultiSelectActionBarTitle"><xliff:g id="number">%1$s</xliff:g> selected</string> @@ -425,41 +262,9 @@ <!-- A format string used for displaying the date, time and duration for a voicemail call log. For example: Jul 25, 2014 at 2:49 PM • 00:34 --> <string name="voicemailCallLogDateTimeFormatWithDuration"><xliff:g example="Jul 25, 2014 at 2:49PM" id="dateAndTime">%1$s</xliff:g> \u2022 <xliff:g example="01:22" id="duration">%2$s</xliff:g></string> - <!-- Dialog message which is shown when the user tries to make a phone call - to prohibited phone numbers [CHAR LIMIT=NONE] --> - <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string> - - <!-- Dialog message which is shown when the user tries to check voicemail - while the system isn't ready for the access. [CHAR LIMIT=NONE] --> - <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu > Settings.</string> - - <!-- Dialog message which is shown when the user tries to check voicemail - while the system is in airplane mode. The user cannot access to - voicemail service in Airplane mode. [CHAR LIMI=NONE] --> - <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string> - - <!-- Message that appears in the favorites tab of the Phone app when the contact list has not fully loaded yet (below the favorite and frequent contacts) [CHAR LIMIT=20] --> - <string name="contact_list_loading">Loading\u2026</string> - - <!-- The title of a dialog that displays the IMEI of the phone --> - <string name="imei">IMEI</string> - - <!-- The title of a dialog that displays the MEID of the CDMA phone --> - <string name="meid">MEID</string> - - <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial --> - <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string> - - <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial --> - <string name="simContacts_title">SIM card contacts</string> - <!-- Message displayed when there is no application available to handle voice search. [CHAR LIMIT=NONE] --> <string name="voice_search_not_available">Voice search not available</string> - <!-- Message displayed when the Phone application has been disabled and a phone call cannot - be made. [CHAR LIMIT=NONE] --> - <string name="call_not_available">Cannot make a phone call because the Phone application has been disabled.</string> - <!-- Hint displayed in dialer search box when there is no query that is currently typed. [CHAR LIMIT=30] --> <string name="dialer_hint_find_contact">Search contacts</string> @@ -468,12 +273,6 @@ [CHAR LIMIT=45] --> <string name="block_number_search_hint">Add number or search contacts</string> - <!-- String resource for the font-family to use for the call log activity's title --> - <string name="call_log_activity_title_font_family" translatable="false">sans-serif-light</string> - - <!-- String resource for the font-family to use for the full call history footer --> - <string name="view_full_call_history_font_family" translatable="false">sans-serif</string> - <!-- Text displayed when the call log is empty. --> <string name="call_log_all_empty">Your call history is empty</string> @@ -486,11 +285,8 @@ <!-- Text displayed when the list of voicemails is empty --> <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string> - <!-- Menu option to show favorite contacts only --> - <string name="show_favorites_only">Show favorites only</string> - <!-- Title of activity that displays a list of all calls --> - <string name="call_log_activity_title">Call History</string> + <string name="call_log_activity_title" tools:ignore="UnusedResources">Call History</string> <!-- Title for the call log tab containing the list of all voicemails and calls [CHAR LIMIT=30] --> @@ -500,10 +296,6 @@ [CHAR LIMIT=30] --> <string name="call_log_missed_title">Missed</string> - <!-- Title for the call log tab containing the list of all voicemail calls only - [CHAR LIMIT=30] --> - <string name="call_log_voicemail_title">Voicemail</string> - <!-- Accessibility text for the tab showing recent and favorite contacts who can be called. [CHAR LIMIT=40] --> <string name="tab_speed_dial">Speed dial</string> @@ -517,11 +309,6 @@ <!-- Accessibility text for the tab showing the user's voicemails. [CHAR LIMIT=40] --> <string name="tab_voicemail">Voicemail</string> - <!-- Text displayed when user swipes out a favorite contact --> - <string name="favorite_hidden">Removed from favorites</string> - <!-- Text displayed for the undo button to undo removing a favorite contact --> - <string name="favorite_hidden_undo">Undo</string> - <!-- Shortcut item used to call a number directly from search --> <string name="search_shortcut_call_number">Call <xliff:g id="number">%s</xliff:g> @@ -544,21 +331,12 @@ <!-- Shortcut item used to block a number directly from search. [CHAR LIMIT=25] --> <string name="search_shortcut_block_number">Block number</string> - <!-- Number of missed calls shown on call card [CHAR LIMIT=40] --> - <string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string> - <!-- Shown when there are no speed dial favorites. --> <string name="speed_dial_empty">No one is on your speed dial yet</string> <!-- Shown as an action when there are no speed dial favorites --> <string name="speed_dial_empty_add_favorite_action">Add a favorite</string> - <!-- Shows up as a tooltip to provide a hint to the user that the profile pic in a contact - card can be tapped to bring up a list of all numbers, or long pressed to start reordering - [CHAR LIMIT=NONE] - --> - <string name="contact_tooltip">Touch image to see all numbers or touch & hold to reorder</string> - <!-- Remove button that shows up when contact is long-pressed. [CHAR LIMIT=NONE] --> <string name="remove_contact">Remove</string> @@ -649,36 +427,6 @@ Listen to voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> </string> - <!-- String describing the "play voicemail" action for an entry in the call log. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <string name="description_voicemail_play"> - Play voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> - </string> - - <!-- String describing the "pause voicemail" action for an entry in the call log. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <string name="description_voicemail_pause"> - Pause voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> - </string> - - - <!-- String describing the "delete voicemail" action for an entry in the call log. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <string name="description_voicemail_delete"> - Delete voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> - </string> - - <!-- String describing the number of new voicemails, displayed as a number badge on a tab. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <plurals name="description_voicemail_unread"> - <item quantity="one"><xliff:g id="count">%d</xliff:g> new voicemail</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> new voicemails</item> - </plurals> - <!-- Description for the "create new contact" action for an entry in the call log. This action opens a screen for creating a new contact for this name or number. [CHAR LIMIT=NONE] --> <string name="description_create_new_contact_action"> @@ -700,10 +448,6 @@ Call details for <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> </string> - <!-- Toast message which appears when a call log entry is deleted. - [CHAR LIMIT=NONE] --> - <string name="toast_entry_removed">Deleted from call history</string> - <!-- String used as a header in the call log above calls which occurred today. [CHAR LIMIT=65] --> <string name="call_log_header_today">Today</string> @@ -716,11 +460,6 @@ [CHAR LIMIT=65] --> <string name="call_log_header_other">Older</string> - <!-- String a header on the call details screen. Appears above the list calls to or from a - particular number. - [CHAR LIMIT=65] --> - <string name="call_detail_list_header">Calls list</string> - <!-- String describing the "speaker on" button on the playback control used to listen to a voicemail message. When speaker is on, playback of the voicemail will occur through the phone speaker. @@ -735,18 +474,6 @@ [CHAR LIMIT=NONE] --> <string name="voicemail_speaker_off">Turn speaker off.</string> - <!-- String describing the "play faster" button in the playback control used to listen to a - voicemail message. Speeds up playback of the voicemail message. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <string name="voicemail_play_faster">Play faster.</string> - - <!-- String describing the "play slower" button in the playback control used to listen to a - voicemail message. Slows down playback of the voicemail message. - Note: AccessibilityServices uses this attribute to announce the purpose of the button. - [CHAR LIMIT=NONE] --> - <string name="voicemail_play_slower">Play slower.</string> - <!-- String describing the "play/pause" button in the playback control used to listen to a voicemail message. Starts playback or pauses ongoing playback. Note: AccessibilityServices uses this attribute to announce the purpose of the button. @@ -800,9 +527,6 @@ <!-- Label for the voicemail settings section [CHAR LIMIT=30] --> <string name="voicemail_settings_label">Voicemail</string> - <!-- Title for the preference screen to select which SIM to change voicemail settings for [CHAR LIMIT=30] --> - <string name="voicemail_settings_select_sim_title">Select SIM for voicemail settings</string> - <!-- Label for a section describing that call blocking is temporarily disabled because an emergency call was made. [CHAR LIMIT=50] --> <string name="blocked_numbers_disabled_emergency_header_label"> @@ -877,18 +601,12 @@ <!-- Internal key for DTMF tone length preference. --> <string name="dtmf_tone_length_preference_key" translatable="false">button_dtmf_settings</string> - <!-- The label of the button used to turn on multiple permissions [CHAR LIMIT=30]--> - <string name="permission_multiple_turn_on">Set permissions</string> - <!-- Shown as a prompt to turn on the contacts permission to enable speed dial [CHAR LIMIT=NONE]--> <string name="permission_no_speeddial">To enable speed dial, turn on the Contacts permission.</string> <!-- Shown as a prompt to turn on the phone permission to enable the call log [CHAR LIMIT=NONE]--> <string name="permission_no_calllog">To see your call log, turn on the Phone permission.</string> - <!-- Shown as a prompt to turn on the phone permission to show voicemails [CHAR LIMIT=NONE]--> - <string name="permission_no_voicemail">To access your voicemail, turn on the Phone permission.</string> - <!-- Shown as a prompt to turn on contacts permissions to allow contact search [CHAR LIMIT=NONE]--> <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string> @@ -930,6 +648,15 @@ <!-- Label for setting that shows more information about the Phone app [CHAR LIMIT=30] --> <string name="about_phone_label">About</string> + <!-- Label indicating who provided the voicemail transcription [CHAR LIMIT=40] --> + <string name="voicemail_transcription_branding_text">Transcribed by Google</string> + + <!-- Label indicating that a voicemail transcription is in progress [CHAR LIMIT=40] --> + <string name="voicemail_transcription_in_progress">Google is transcribing …</string> + + <!-- Label indicating that a voicemail transcription failed [CHAR LIMIT=40] --> + <string name="voicemail_transcription_failed">Transcript not available</string> + <!-- Button text to prompt a user to open an sms conversation [CHAR LIMIT=NONE] --> <string name="view_conversation">View</string> diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml index e0122e81c..d464ca7f2 100644 --- a/java/com/android/dialer/app/res/values/styles.xml +++ b/java/com/android/dialer/app/res/values/styles.xml @@ -105,19 +105,6 @@ <item name="android:fastScrollTrackDrawable">@null</item> </style> - <style name="CallDetailActionItemStyle"> - <item name="android:foreground">?android:attr/selectableItemBackground</item> - <item name="android:clickable">true</item> - <item name="android:drawablePadding">@dimen/call_detail_action_item_drawable_padding</item> - <item name="android:gravity">center_vertical</item> - <item name="android:paddingStart">@dimen/call_detail_action_item_padding_horizontal</item> - <item name="android:paddingEnd">@dimen/call_detail_action_item_padding_horizontal</item> - <item name="android:paddingTop">@dimen/call_detail_action_item_padding_vertical</item> - <item name="android:paddingBottom">@dimen/call_detail_action_item_padding_vertical</item> - <item name="android:textColor">@color/call_detail_footer_text_color</item> - <item name="android:textSize">@dimen/call_detail_action_item_text_size</item> - </style> - <style name="DialtactsActionBarStyle" parent="DialerActionBarBaseStyle"> <!-- Styles that require AppCompat compatibility, remember to update both sets --> <item name="android:background">@color/actionbar_background_color</item> @@ -203,11 +190,6 @@ <item name="android:importantForAccessibility">no</item> </style> - <style name="DismissButtonStyle"> - <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item> - <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item> - </style> - <!-- Style applied to the "Settings" screen. Keep in sync with SettingsLight in Telephony. --> <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay"> <!-- Setting text. --> @@ -234,10 +216,6 @@ <item name="height">@dimen/action_bar_height</item> </style> - <style name="VoicemailPlaybackLayoutTextStyle"> - <item name="android:textSize">14sp</item> - </style> - <style name="VoicemailPlaybackLayoutButtonStyle"> <item name="android:layout_width">56dp</item> <item name="android:layout_height">56dp</item> |