diff options
Diffstat (limited to 'chromium/chrome/browser/ui/android')
6 files changed, 350 insertions, 100 deletions
diff --git a/chromium/chrome/browser/ui/android/appmenu/BUILD.gn b/chromium/chrome/browser/ui/android/appmenu/BUILD.gn index 26b23eec23f..6b117b5cf25 100644 --- a/chromium/chrome/browser/ui/android/appmenu/BUILD.gn +++ b/chromium/chrome/browser/ui/android/appmenu/BUILD.gn @@ -21,8 +21,12 @@ android_library("java") { } android_library_factory("factory_java") { + # These deps will be inherited by the resulting android_library target. deps = [ ":java" ] - sources = [ "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java" ] + + # This internal file will be replaced by a generated file so the resulting + # android_library target does not actually depend on this internal file. + sources = [ "//chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java" ] } android_resources("java_resources") { diff --git a/chromium/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chromium/chrome/browser/ui/android/appmenu/internal/BUILD.gn index 81e5cda8251..91cf3e0a673 100644 --- a/chromium/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chromium/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -30,6 +30,7 @@ android_library("java") { "//components/browser_ui/widget/android:java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//ui/android:ui_java", ] } @@ -74,6 +75,7 @@ android_library("javatests") { "//components/browser_ui/widget/android:test_support_java", "//content/public/test/android:content_java_test_support", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/junit", @@ -110,5 +112,8 @@ java_library("junit") { deps = [ ":java", "//base:base_junit_test_support", + "//third_party/android_deps:robolectric_all_java", + "//third_party/junit", + "//third_party/mockito:mockito_java", ] } diff --git a/chromium/chrome/browser/ui/android/default_browser_promo/BUILD.gn b/chromium/chrome/browser/ui/android/default_browser_promo/BUILD.gn new file mode 100644 index 00000000000..6ebd8d0b94c --- /dev/null +++ b/chromium/chrome/browser/ui/android/default_browser_promo/BUILD.gn @@ -0,0 +1,78 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + +android_library("java") { + sources = [ + "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoDialog.java", + "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoManager.java", + "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoMetrics.java", + "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoUtils.java", + ] + deps = [ + ":java_resources", + "//base:base_java", + "//chrome/browser/android/lifecycle:java", + "//chrome/browser/flags:java", + "//chrome/browser/preferences:java", + "//chrome/browser/profiles/android:java", + "//components/browser_ui/widget/android:java", + "//ui/android:ui_full_java", + ] +} + +android_resources("java_resources") { + custom_package = "org.chromium.chrome.browser.ui.default_browser_promo" + sources = [ + "java/res/drawable/default_browser_promo_illustration.xml", + "java/res/drawable/ic_illustration_aroundlogo.xml", + ] + deps = [ + "//chrome/browser/ui/android/strings:ui_strings_grd", + "//components/browser_ui/widget/android:java_resources", + "//ui/android:ui_java_resources", + ] +} + +java_library("junit") { + # Skip platform checks since Robolectric depends on requires_android targets. + bypass_platform_checks = true + testonly = true + sources = [ "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoUtilsTest.java" ] + deps = [ + ":java", + "//base:base_java", + "//base:base_junit_test_support", + "//third_party/android_deps:robolectric_all_java", + "//third_party/junit", + "//third_party/mockito:mockito_java", + ] +} + +android_library("javatests") { + testonly = true + + sources = [ "java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoManagerTest.java" ] + + deps = [ + ":java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/android:chrome_java", + "//chrome/browser/android/lifecycle:java", + "//chrome/test/android:chrome_java_test_support", + "//components/browser_ui/widget/android:java", + "//content/public/test/android:content_java_test_support", + "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_preference_preference_java", + "//third_party/android_deps:espresso_java", + "//third_party/android_support_test_runner:rules_java", + "//third_party/android_support_test_runner:runner_java", + "//third_party/hamcrest:hamcrest_java", + "//third_party/junit:junit", + "//ui/android:ui_full_java", + "//ui/android:ui_java_test_support", + ] +} diff --git a/chromium/chrome/browser/ui/android/native_page/BUILD.gn b/chromium/chrome/browser/ui/android/native_page/BUILD.gn index 8157eb75511..01c80a961da 100644 --- a/chromium/chrome/browser/ui/android/native_page/BUILD.gn +++ b/chromium/chrome/browser/ui/android/native_page/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/android/rules.gni") -import("//chrome/android/features/android_library_factory_tmpl.gni") android_library("java") { sources = [ diff --git a/chromium/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chromium/chrome/browser/ui/android/strings/android_chrome_strings.grd index 5958622986a..8400b41389c 100644 --- a/chromium/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chromium/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -251,9 +251,7 @@ CHAR-LIMIT guidelines: <message name="IDS_NOTIFICATION_CATEGORY_ANNOUNCEMENT" desc="Label for announcements notifications, within a list of notification categories. [CHAR-LIMIT=32]"> Announcements </message> - <message name="IDS_NOTIFICATION_CATEGORY_MEDIA_PLAYBACK" desc="Label for media playback notifications, within a list of notification categories. [CHAR-LIMIT=32]"> - Playing media - </message> + <message name="IDS_NOTIFICATION_CATEGORY_PERMISSION_REQUESTS" desc="Label for permission requests, within a list of notification categories. [CHAR-LIMIT=32]"> Permission requests </message> @@ -426,6 +424,12 @@ CHAR-LIMIT guidelines: <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_NAME" desc="Label for text input field containing the name on a credit card. [CHAR-LIMIT=32]"> Name on card </message> + <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_NICKNAME" desc="Label for text input field containing the nickname on a credit card. [CHAR-LIMIT=25]"> + Card nickname + </message> + <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_INVALID_NICKNAME" desc="Label for text input field containing the nickname on a credit card. [CHAR-LIMIT=25]"> + Nickname can’t include numbers + </message> <message name="IDS_AUTOFILL_CARD_HOLDER_NAME" desc="Label for text input field containing the name on a credit card. [CHAR-LIMIT=32]"> Cardholder name </message> @@ -484,6 +488,12 @@ CHAR-LIMIT guidelines: <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_OUT_ENABLE_DESCRIPTION" desc="Description for the switch toggling whether Chrome should check that entered credentials have been part of a leak. Displayed for users who are not signed in and syncing."> When you sign in to your Google Account, this feature is turned on </message> + <message name="IDS_PASSWORDS_CHECK_TITLE" desc="Title for the check passwords button which allows to check whether the user's passwords have been compromised."> + Check passwords + </message> + <message name="IDS_PASSWORDS_CHECK_DESCRIPTION" desc="Text explaining the benefits of checking the passwords, to be displayed under the Check Passwords button title."> + Keep your passwords safe from data breaches and other security issues + </message> <message name="IDS_SECTION_SAVED_PASSWORDS_EXCEPTIONS" desc="Header for the list of websites for which user selected to never save passwords. [CHAR-LIMIT=32]"> Never saved </message> @@ -716,6 +726,45 @@ For example, some websites may respond to this request by showing you ads that a <message name="IDS_CAN_MAKE_PAYMENT_TITLE" desc="Title for preference to allow websites to know whether you have payment methods available through PaymentRequest.CanMakePayment interface"> Access payment methods </message> + <message name="IDS_SETTINGS_CUSTOM" desc="Label for a custom option in a dropdown menu."> + Custom + </message> + <message name="IDS_SETTINGS_SECURE_DNS_TITLE" desc="Title of the Secure DNS settings option"> + Use secure DNS + </message> + <message name="IDS_SETTINGS_SECURE_DNS_DESCRIPTION" desc="Secondary, continued explanation of secure DNS in Privacy options"> + Determines how to connect to websites over a secure connection + </message> + <message name="IDS_SETTINGS_AUTOMATIC_MODE_LABEL" desc="Text of the radio button that puts secure DNS in auto-upgrade mode"> + Use your current service provider + </message> + <message name="IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION" desc="Descriptive text that appears below IDS_SETTINGS_AUTOMATIC_MODE_LABEL."> + Secure DNS may not be available all the time + </message> + <message name="IDS_SETTINGS_AUTOMATIC_MODE_SUMMARY" desc="Short description of automatic mode"> + Automatic + </message> + <message name="IDS_SETTINGS_SECURE_DROPDOWN_MODE_DESCRIPTION" desc="Text of the radio button that allows a secure resolver to be selected from a dropdown menu"> + Choose another provider: + </message> + <message name="IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY" desc="Text that displays a link to the privacy policy of the resolver selected from a dropdown menu"> + See this provider's <ph name="BEGIN_LINK"><a target="_blank" href="$1<ex>https://google.com/</ex>"></ph>privacy policy<ph name="END_LINK"></a></ph> + </message> + <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of a managed environment"> + This setting is disabled on managed browsers + </message> + <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of OS-level parental controls"> + This setting is disabled because parental controls are on + </message> + <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER" desc="Placeholder text for a textbox where users can enter a custom secure DNS provider"> + Provider URL + </message> + <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR" desc="Error text for an incorrectly formatted entry for the custom secure DNS provider"> + Enter a correctly formatted URL + </message> + <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR" desc="Error text for a custom secure DNS provider entry to which a probe connection fails"> + Please verify that this is a valid provider or try again later + </message> <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Title of the Clear Browsing Data screen. [CHAR-LIMIT=32]"> Clear browsing data </message> @@ -821,6 +870,50 @@ Your Google account may have other forms of browsing history like searches and a <ph name="NUMBER_OF_ITEMS">%1$s<ex>3</ex></ph> items deleted </message> + <!-- Safety check --> + <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR-LIMIT=32]"> + Safety check + </message> + <message name="IDS_SAFETY_CHECK_DESCRIPTION" desc="Introduces the safety check categories to the user. Followed by several items, such as 'Safe Browsing', 'Updates', 'Passwords'."> + Chrome can check if your settings are protecting you from: + </message> + <message name="IDS_SAFETY_CHECK_SAFE_BROWSING_TITLE" desc="Title for the Safe Browsing section."> + Safe Browsing + </message> + <message name="IDS_SAFETY_CHECK_UPDATES_TITLE" desc="Title for the updates section."> + Updates + </message> + <message name="IDS_SAFETY_CHECK_PASSWORDS_TITLE" desc="Title for the passwords section."> + Passwords + </message> + <message name="IDS_SAFETY_CHECK_BUTTON" desc="Text for the button to start Safety check."> + Check now + </message> + <message name="IDS_SAFETY_CHECK_UNCHECKED" desc="A given element has not been checked."> + Unchecked + </message> + <message name="IDS_SAFETY_CHECK_CHECKING" desc="A given element is being checked."> + Checking + </message> + <message name="IDS_SAFETY_CHECK_ERROR" desc="A generic error state."> + An error occurred. + </message> + <message name="IDS_SAFETY_CHECK_SAFE_BROWSING_DISABLED" desc="Text to display when Safe Browsing is disabled."> + Safe Browsing is off. Chrome recommends turning it on. + </message> + <message name="IDS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD" desc="Text to display when Safe Browsing is set to standard protection."> + Standard Protection is on + </message> + <message name="IDS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_ENHANCED" desc="Text to display when Safe Browsing is set to enhanced protection."> + Enhanced Protection is on + </message> + <message name="IDS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_BY_ADMIN" desc="Text to display when Safe Browsing is disabled by admin."> + <ph name="BEGIN_LINK"><a target="_blank" href="$1"></ph>Your administrator<ph name="END_LINK"></a></ph> has turned off Safe Browsing + </message> + <message name="IDS_SAFETY_CHECK_PASSWORDS_NO_PASSWORDS" desc="Text to display when no passwords are saved."> + No saved passwords. Chrome can check your passwords when you save them. + </message> + <!-- Accessibility preferences --> <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR-LIMIT=32]"> Accessibility @@ -994,6 +1087,32 @@ Your Google account may have other forms of browsing history like searches and a Chrome has saved you <ph name="gigabytes">%1$d<ex>10</ex></ph> GB </message> + <!-- Download later --> + <message name="IDS_DOWNLOAD_LATER_DIALOG_TITLE" desc="Title of the download later dialog that let the user to choose the time to download."> + Choose when to download + </message> + <message name="IDS_DOWNLOAD_LATER_DIALOG_SUBTITLE" desc="Subtitle of the download later dialog that let the user to choose the time to download."> + You'll see a notification when this file is ready + </message> + <message name="IDS_DOWNLOAD_LATER_DOWNLOAD_NOW_TEXT" desc="The text for the radio button to trigger the download now in download later dialog."> + Now + </message> + <message name="IDS_DOWNLOAD_LATER_EDIT_LOCATION" desc="The text in the download later dialog that can be clicked to edit download location."> + Your file will be saved to <ph name="BEGIN_BOLD"><b></ph><ph name="DIRECTORY">%1$s<ex>Downloads</ex></ph><ph name="END_BOLD"></b></ph>. <ph name="BEGIN_LINK2"><LINK2></ph>Edit<ph name="END_LINK2"></LINK2></ph>. + </message> + <message name="IDS_DOWNLOAD_DATE_TIME_PICKER_NEXT_TEXT" desc="The text for the positive button of the download date time picker dialog."> + Next + </message> + <message name="IDS_DOWNLOAD_LATER_ON_WIFI_TEXT" desc="The text for the radio button to trigger the download on WIFI in download later dialog."> + On Wi-Fi + </message> + <message name="IDS_DOWNLOAD_LATER_PICK_TIME_TEXT" desc="The text for the radio button to select the download time in download later dialog."> + Pick date & time + </message> + <message name="IDS_DOWNLOAD_LATER_PROMPT_ENABLED_TITLE" desc="A setting text to ask whether to show a dialog about when to download."> + Ask when to save files + </message> + <!-- Downloads location --> <message name="IDS_DOWNLOADS_LOCATION_SELECTOR_TITLE" desc="Title of the preference that allows the user to select which of the folders they would like to make the default location to save their downloads."> Download location @@ -1008,7 +1127,7 @@ Your Google account may have other forms of browsing history like searches and a Ask where to save files </message> <message name="IDS_DOWNLOAD_LOCATION_DIALOG_TITLE" desc="Title for the dialog that asks where the user wants to save the download file before the download begins."> - Download file + Choose where to download </message> <message name="IDS_DOWNLOAD_LOCATION_DIALOG_CHECKBOX" desc="Label for the checkbox that allows the user to indicate if they do not want the download location selection dialog to appear every time they initiate a download."> Don‘t show again @@ -1487,9 +1606,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p </message> <!-- InfoBar --> - <message name="IDS_INFOBAR_CLOSE" desc="Accessibility label for the dismiss infobar Button"> - Close - </message> <message name="IDS_BOTTOM_BAR_SCREEN_POSITION" desc="Accessibility label to inform users about the InfoBar location"> Options available near bottom of the screen </message> @@ -1541,12 +1657,23 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p =1 {1 download pending.} other {# downloads pending.}} </message> + <message name="IDS_MULTIPLE_DOWNLOAD_SCHEDULED" desc="Label describing that one or more downloads are scheduled"> + {FILE_COUNT, plural, + =1 {1 download scheduled.} + other {# downloads scheduled.}} + </message> <message name="IDS_DOWNLOAD_INFOBAR_FILENAME" desc="Label showing the file name that just finished downloading"> <ph name="FILE_NAME">%1$s<ex>abc.png</ex></ph>. </message> <message name="IDS_DOWNLOAD_INFOBAR_ACCESSIBILITY_MESSAGE_WITH_LINK" desc="InfoBar accessibility text describing the link on the download progress infobar"> <ph name="MESSAGE">%1$s<ex>Downloading file (200 MB)</ex></ph> <ph name="LINK_NAME">%2$s<ex>Details</ex></ph> button </message> + <message name="IDS_DOWNLOAD_SCHEDULED_ON_WIFI" desc="Label describing that the download was scheduled to start on Wi-Fi."> + Download will start on Wi-Fi. + </message> + <message name="IDS_DOWNLOAD_SCHEDULED_ON_DATE" desc="Label describing that the download was scheduled to start at a later date or time."> + Download will start on <ph name="date">%1$s<ex>Feb 28</ex></ph>. + </message> <!-- Inline Update Infobar --> <message name="IDS_INLINE_UPDATE_INFOBAR_READY_MESSAGE" desc="Text showing that the update process is almost ready."> @@ -1629,9 +1756,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_MENU_SHARE_PAGE" desc="Menu item for sharing the current page. [CHAR-LIMIT=27]"> Share… </message> - <message name="IDS_SHARE_LINK_CHOOSER_TITLE" desc="title for the share dialog when sharing the current address [CHAR-LIMIT=27]"> - Share via - </message> <message name="IDS_ACCESSIBILITY_MENU_SHARE_VIA" desc="Content description share current page via the most recently used application menu item"> Share via <ph name="APPLICATION">%s<ex>Gmail</ex></ph> </message> @@ -1722,6 +1846,15 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_CONTEXTMENU_SEARCH_WITH_GOOGLE_LENS" desc="Context sensitive menu item for deep linking into google lens. [CHAR-LIMIT=30]"> Search with Google Lens <ph name="BEGIN_NEW"><new></ph>New<ph name="END_NEW"></new></ph> </message> + <message name="IDS_CONTEXTMENU_SHOP_SIMILAR_PRODUCTS" desc="Context sensitive menu item for deep linking into google lens for shopping results. [CHAR-LIMIT=30]"> + Shop similar products <ph name="BEGIN_NEW"><new></ph>New<ph name="END_NEW"></new></ph> + </message> + <message name="IDS_CONTEXTMENU_SHOP_IMAGE_WITH_GOOGLE_LENS" desc="Context sensitive menu item for deep linking into google lens for shopping results. [CHAR-LIMIT=30]"> + Shop image with Google Lens <ph name="BEGIN_NEW"><new></ph>New<ph name="END_NEW"></new></ph> + </message> + <message name="IDS_CONTEXTMENU_SEARCH_SIMILAR_PRODUCTS" desc="Context sensitive menu item for deep linking into google lens for shopping results. [CHAR-LIMIT=30]"> + Search similar products <ph name="BEGIN_NEW"><new></ph>New<ph name="END_NEW"></new></ph> + </message> <message name="IDS_CONTEXTMENU_SEARCH_WEB_FOR_IMAGE" desc="Context sensitive menu item for search-for-Image command in a new tab. [CHAR-LIMIT=30]"> Search <ph name="SEARCH_ENGINE">%1$s<ex>Google</ex></ph> for this image </message> @@ -1743,8 +1876,8 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_CONTEXTMENU_OPEN_IN_EPHEMERAL_TAB" desc="Context-sensitive menu item to open a quick preview of the selected linked page. Note that 'preview' is a verb, not a noun. We're also labeling it *New* to draw attention to it when first released. The selected link will open in an overlay panel on top of the current tab which will go away easily too. [CHAR-LIMIT=30]"> Preview page <ph name="BEGIN_NEW"><new></ph>New<ph name="END_NEW"></new></ph> </message> - <message name="IDS_CONTEXTMENU_PERFORMANCE_INFO_FAST" desc="This string is shown in the context sensitive menu for links and is shown underneath the link URL. It indicates to the user that the link's target website should load quickly. [CHAR-LIMIT=30]"> - Fast site + <message name="IDS_CONTEXTMENU_PERFORMANCE_INFO_FAST" desc="This string is shown in the context sensitive menu for links and is shown underneath the link URL. It indicates to the user that the link's target page is fast-loading and responsive. [CHAR-LIMIT=30]"> + Fast page </message> <!-- Swipe refresh --> @@ -2058,7 +2191,10 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <ph name="FILE_SIZE_OF_TOTAL">%1$s<ex>1.56 MB / 10MB</ex></ph> <ph name="SEPARATOR">•</ph> <ph name="DESCRIPTION">%2$s<ex>failed</ex></ph> </message> <message name="IDS_DOWNLOAD_MANAGER_JUST_NOW" desc="Text on a label describing that the associated download event happened just now."> - Just Now + Just now + </message> + <message name="IDS_DOWNLOAD_MANAGER_SCHEDULED_LATER" desc="Text on a label describing that the associated download is scheduled to start later."> + Scheduled for later </message> <message name="IDS_DOWNLOAD_MANAGER_OFFLINE_HOME" desc="The title text on download home indicating that we are in offline mode."> Offline Home @@ -2189,25 +2325,27 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_SIGNIN_PROMO_CHOOSE_ANOTHER_ACCOUNT" desc="Button that the user can press if they want to select a different account before signing in. This button is shown below 'Continue as Joe Doe' button that signs user in with default account."> Choose another account </message> - - <!-- Messages for remote media playback (casting) --> - <message name="IDS_ACCESSIBILITY_PLAY" desc="The play button that starts playing the media."> - Play + <message name="IDS_SIGNIN_PROMO_STATUS_MESSAGE" desc="Title string for 'Turn on sync' sync promos."> + Sync is off </message> - <message name="IDS_ACCESSIBILITY_PAUSE" desc="The pause button that pauses playing the media."> - Pause + <message name="IDS_SYNC_PROMO_TURN_ON_SYNC" desc="Button that the user can press if they want to turn on sync with this account."> + Turn on sync </message> - <message name="IDS_ACCESSIBILITY_PREVIOUS_TRACK" desc="The previous track button that switches media to the previous track."> - Previous track + + <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING" desc="Alert dialog text warning the user (who is currently in incognito mode) that the site they are currently using is going to share data with an external application." formatter_data="android_java"> + This site is about to share information with an app outside of incognito mode. </message> - <message name="IDS_ACCESSIBILITY_NEXT_TRACK" desc="The next track button that switches media to the next track."> - Next track + <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING_TITLE" desc="Title for dialog asking if the user wants to leave incognito mode. [CHAR-LIMIT=32]" formatter_data="android_java"> + Leave incognito mode? </message> - <message name="IDS_ACCESSIBILITY_SEEK_FORWARD" desc="The seek forward button that seeks media to a later position."> - Seek forward + <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_STAY" desc="Label for the dialog button to stay in incognito mode. [CHAR-LIMIT=20]" formatter_data="android_java"> + Stay </message> - <message name="IDS_ACCESSIBILITY_SEEK_BACKWARD" desc="The seek backward button that seeks media to an earlier position."> - Seek backward + <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_LEAVE" desc="Label for the dialog button to leave incognito mode. [CHAR-LIMIT=20]" formatter_data="android_java"> + Leave + </message> + <message name="IDS_EXTERNAL_APP_RESTRICTED_ACCESS_ERROR" desc="A message shown to the user if Chrome receives a file view request to something Chrome does not have access to view." formatter_data="android_java"> + Chrome does not have access to the requested resource. </message> <!-- New Tab Page strings --> @@ -2731,6 +2869,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_ACCESSIBILITY_OMNIBOX_BTN_REFINE" desc="Content description for the omnibox refine button."> Refine </message> + <message name="IDS_ACCESSIBILITY_OMNIBOX_SWITCH_TO_TAB" desc="Content description for the omnibox switch to tab button."> + Switch To Tab + </message> <message name="IDS_ACCESSIBILITY_SHARE_SELECTED_ITEMS" desc="Content description for the button to share selected items. [ICU Syntax]"> @@ -2754,10 +2895,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p Tabs </message> - <message name="IDS_MEDIA_NOTIFICATION_INCOGNITO" desc="Text used as a placeholder for a media notification about playing media, when notification is shown from incognito tab."> - A site is playing media - </message> - <!-- Contextual Search --> <message name="IDS_CONTEXTUAL_SEARCH_NETWORK_UNAVAILABLE" desc="Tells the user the network is not accessible."> Unable to access the network @@ -2798,6 +2935,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_CONTEXTUAL_SEARCH_IPH_TAP" desc="An in-product-help message for encouraging users to tap instead of long pressing to trigger the Tap to Search feature."> You can also search with a quick tap on a word </message> + <message name="IDS_CONTEXTUAL_SEARCH_IPH_TOUCH_AND_HOLD" desc="An in-product-help message for encouraging users to use a touch and hold gesture to trigger the Touch to Search feature."> + To search, touch & hold a word + </message> + <message name="IDS_CONTEXTUAL_SEARCH_IPH_TOUCH_AND_HOLD_ENGAGED" desc="An in-product-help message for encouraging engaged users to use a touch and hold gesture to trigger the Touch to Search feature."> + To search, touch & hold a word instead of tapping it + </message> <!-- Web apps --> <message name="IDS_WEBAPP_ACTIVITY_TITLE" desc="Title in recent tasks list for web apps, i.e. web pages that are shown in a separate window"> @@ -2877,6 +3020,20 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p Preview tab is closed </message> + <!-- Feed Card Menu --> + <message name="IDS_FEED_CARD_MENU_DESCRIPTION" desc="The content description of the feed card menu bottom sheet."> + Feed card menu + </message> + <message name="IDS_FEED_CARD_MENU_OPENED_HALF" desc="Accessibility string read when the feed card menu bottom sheet is opened at half height. This should never happen, no need to translate."> + Feed card menu half height + </message> + <message name="IDS_FEED_CARD_MENU_OPENED_FULL" desc="Accessibility string read when the feed card menu bottom sheet is opened at full height. The sheet will occupy up to the full screen."> + Feed card menu is opened + </message> + <message name="IDS_FEED_CARD_MENU_CLOSED" desc="Accessibility string read when the feed card menu bottom sheet is closed."> + Feed card menu is closed + </message> + <!-- Storage Preference UI strings for clearing storage. --> <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity."> Google <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> storage @@ -2921,14 +3078,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p All Chrome’s app data will be deleted permanently. This includes all files, settings, accounts, databases, etc. </message> - <!-- Client certificate selection failure strings. --> - <message name="IDS_CLIENT_CERT_UNSUPPORTED_TITLE" desc="Title of a dialog box for when the operating system does not support client SSL certificate selection"> - Unable to select certificate. - </message> - <message name="IDS_CLIENT_CERT_UNSUPPORTED_MESSAGE" desc="The message in a dialog box for when the operating system does not support client SSL certificate selection"> - Client side certificate selection is not supported by the operating system. - </message> - <!-- WebUsb Picker UI strings --> <message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user."> <ph name="SITE">%1$s<ex>https://www.google.com</ex></ph> wants to connect @@ -3002,6 +3151,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_ACCESSIBILITY_UNMUTE_VIDEO" desc="The accessibility string for the unmute video button."> Unmute video </message> + <message name="IDS_ACCESSIBILITY_FULL_SCREEN" desc="The accessibility string for the full screen video button."> + Full screen + </message> + <message name="IDS_ACCESSIBILITY_EXIT_FULL_SCREEN" desc="The accessibility string for the exiting of full screen video button."> + Exit full screen + </message> <message name="IDS_ACCESSIBILITY_VIDEO_PLAYER" desc="The accessibility string for the video player."> Video player </message> @@ -3161,10 +3316,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p Reopen Chrome. </message> - <if expr="enable_vr"> - <part file="xr_consent_ui_strings_java.grdp" /> - </if> - <if expr="enable_arcore"> <!-- ARCore check infobar --> <message name="IDS_AR_CORE_CHECK_INFOBAR_INSTALL_TEXT" desc="Text to be displayed in the ARCore check infobar. When a WebXR page is loaded, if ARCore is needed to display AR content and it is not installed, an infobar will be shown to the user prompting them to install ARCore."> @@ -3178,19 +3329,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_AR_MODULE_TITLE" desc="Text shown when the AR module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Augmented Reality for Chrome…')."> Augmented Reality </message> - <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_TITLE" desc="Title for dialog shown when a site requests consent for starting an augmented reality session."> - Enter AR from <ph name="DOMAIN">%s<ex>example.com</ex></ph>? - </message> - <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_MESSAGE" desc="Message for dialog shown when a site requests consent for starting an augmented reality session."> - While you're in AR, this site may be able to: -• create a 3D map of your environment -• track camera motion - -Only you can see what your camera is looking at. The site can't see your camera's images. - </message> - <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_BUTTON" desc="Confirm button for dialog shown when a site requests consent for starting an augmented reality session."> - Enter AR - </message> <!-- App upgrade from Play Store --> <message name="IDS_UPDATE_FROM_MARKET" desc="Title of button that will direct the user to update an app from the market (Play Store)"> @@ -3233,6 +3371,9 @@ Only you can see what your camera is looking at. The site can't see your camera' <message name="IDS_IPH_DOWNLOAD_HOME_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text to open download home after a restart."> Find your files and pages in Downloads from the More Options button </message> + <message name="IDS_IPH_DOWNLOAD_INDICATOR_TEXT" desc="The in-product-help message to open download home, which is shown alongside the offline indicator when the device goes offline."> + See your offline files + </message> <message name="IDS_IPH_DATA_SAVER_DETAIL_TEXT" desc="The in-product-help message to open lite mode."> See how much data you've saved </message> @@ -3283,11 +3424,6 @@ Only you can see what your camera is looking at. The site can't see your camera' Remove and recreate this shortcut </message> - <!-- BottomSheet --> - <message name="IDS_BOTTOM_SHEET_ACCESSIBILITY_DESCRIPTION" desc="Accessibility string read when the bottom sheet is focused informing the user that the sheet can be closed by swiping down."> - Swipe down to close. - </message> - <!-- SendTabToSelf --> <message name="IDS_SEND_TAB_TO_SELF_TOAST" desc="Text for a toast indicating that the tab is being shared on the user's other synced devices."> Sending to <ph name="device_name">%1$s<ex>Tanya's Pixel 2</ex></ph>... @@ -3570,6 +3706,16 @@ Only you can see what your camera is looking at. The site can't see your camera' Download </message> + <message name="IDS_QR_CODE_ERROR_TOO_LONG" + desc="Error message displayed when a URL exceeds the limit for which we can generate a QR code."> + Can't create QR code. URL is more than <ph name="CHARACTER_LIMIT">%1$d<ex>300</ex></ph> characters. + </message> + + <message name="IDS_QR_CODE_ERROR_UNKNOWN" + desc="Error message displayed when an unknown error occurs."> + Can't create QR code + </message> + <!-- Sharing Hub --> <message name="IDS_SHARING_MORE_ICON_LABEL" desc="Icon label for the More button in the sharing hub."> More @@ -3579,6 +3725,10 @@ Only you can see what your camera is looking at. The site can't see your camera' Copy link </message> + <message name="IDS_SHARING_COPY_TEXT" desc="Label for the Copy Text button in the sharing hub."> + Copy text + </message> + <message name="IDS_SHARING_SCREENSHOT" desc="Label for Screenshot button in the sharing hub."> Screenshot </message> @@ -3587,6 +3737,10 @@ Only you can see what your camera is looking at. The site can't see your camera' Link Copied </message> + <message name="IDS_TEXT_COPIED" desc="Text shown in the toast notification when Copy Text is selected in the sharing hub."> + Text Copied + </message> + <message name="IDS_QR_CODE_CAMERA_FRAMING_RECT_DESCRIPTION" desc="Text under the framing rectangle in QR code camera preview."> Position QR/barcode in this frame. </message> @@ -3631,21 +3785,27 @@ Only you can see what your camera is looking at. The site can't see your camera' chrome_qrcode_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph> </message> - <message name="IDS_QR_CODE_SUCCESSFUL_DOWNLOAD_TITLE" desc="Notification title for successful QR code download."> - QR code downloaded + <!-- Share Screenshot strings --> + <message name="IDS_SCREENSHOT_EDIT_TITLE" desc="The text shown on the share option for screenshots."> + Edit </message> - <message name="IDS_QR_CODE_SUCCESSFUL_DOWNLOAD_TEXT" desc="Notification text for successful QR code download."> - Tap to open QR code + <message name="IDS_SCREENSHOT_DELETE_TITLE" desc="The text shown on the delete option for screenshots."> + Delete </message> - <message name="IDS_QR_CODE_FAILED_DOWNLOAD_TITLE" desc="Notification title for failed QR code download."> - Can't download QR code + <message name="IDS_SCREENSHOT_SAVE_TITLE" desc="The text shown on the save option for screenshots."> + Save + </message> + + <message name="IDS_SCREENSHOT_SHARE_TITLE" desc="The text shown on the share option for screenshots."> + Share </message> - <message name="IDS_QR_CODE_FAILED_DOWNLOAD_TEXT" desc="Notification text for failed QR code download."> - Something went wrong + <message name="IDS_SCREENSHOT_FILENAME_PREFIX" desc="File name prefix for downloaded screenshot that is followed by timestamp."> + chrome_screenshot_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph> </message> + <!-- Chime DFM module strings --> <message name="IDS_CHIME_MODULE_TITLE" desc="Text shown when the chime module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Google Notifications Platform for Chrome…')."> Google Notifications Platform @@ -3673,6 +3833,39 @@ Only you can see what your camera is looking at. The site can't see your camera' Paint Preview playback failed. </message> + <!-- Default Browser Promo Strings--> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_TITLE" desc="Title of the default browser promo dialog"> + Set <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> as your default? + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_DESC" desc="Description in the default browser promo dialog, which is concatenated with one of the following steps strings"> + <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> has the smarts and speed you need to safely do, create, and explore online + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_DISAMBIGUATION_SHEET_STEPS" desc="Description of the steps to set the default browser throught disambiguation sheet. 'Always' should match TC ID 5575222334666843269."> + 1. Choose <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph>\n2. Tap “Always” + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_SYSTEM_SETTINGS_STEPS" + desc="Description of the steps to set the default browser throught system settings. + 'Go to Settings' should match TC ID 4431460803004659888. 'Browser App' should match TC ID 6222206565850006894."> + 1. Go to Settings\n2. Tap “Browser App”\n3. Choose <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_ROLE_MANAGER_STEPS" desc="Description of the steps to set the default browser throught role manager. 'Set as default' should match TC ID 5706081295230541240."> + 1. Choose <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph>\n2. Tap “Set as default” + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_CHOOSE_CHROME_BUTTON" desc="A button in the default browser promo dialog to choose chrome as default"> + Choose <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> + </message> + <message name="IDS_DEFAULT_BROWSER_PROMO_DIALOG_GO_TO_SETTINGS_BUTTON" desc="A button in the default browser promo to navigate users to systen settings. 'Go to Settings' should match TC ID 4431460803004659888."> + Go to Settings + </message> + + <!-- HTTPS image compression InfoBar --> + <message name="IDS_LITE_MODE_HTTPS_IMAGE_COMPRESSION_MESSAGE" desc="The text of the infobar notifying the user that Chrome's Lite mode will now also compresses HTTPS images."> + Lite mode now saves you more data by optimizing images on HTTPS pages. + </message> + <message name="IDS_LITE_MODE_HTTPS_IMAGE_COMPRESSION_SETTINGS_LINK" desc="This link opens the Lite Mode settings page to explain the feature and configure the settings."> + Manage + </message> + <!-- Browser Promo Notification Strings --> <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_1_TITLE" desc="The title of a notification shown to suggest that users use Chrome. Users probably have not opened Chrome in a while. Promotes relevant articles Chrome has."> Read today's news <ph name="NEWS_ICON">📰</ph> diff --git a/chromium/chrome/browser/ui/android/strings/xr_consent_ui_strings_java.grdp b/chromium/chrome/browser/ui/android/strings/xr_consent_ui_strings_java.grdp deleted file mode 100644 index 5ff87217358..00000000000 --- a/chromium/chrome/browser/ui/android/strings/xr_consent_ui_strings_java.grdp +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Copyright 2019 The Chromium Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. ---> -<!-- XR specific strings (included from generated_resources.grd and android_chrome_strings.grd). --> -<!-- These strings are used in the consent flow dialog. --> -<grit-part> - <!-- XR consent dialog. --> - <message name="IDS_XR_CONSENT_DIALOG_TITLE" desc="Title of the user consent dialog displayed before allowing a website to start a VR presentation"> - Enter VR from <ph name="DOMAIN">%s<ex>example.com</ex></ph>? - </message> - <message name="IDS_XR_CONSENT_DIALOG_DESCRIPTION_DEFAULT" desc="This is the header for a bulleted list of potential concerns that we want to ensure the user is aware of before entering VR. This header and the appended items of the bulleted list make up the body of the user consent dialog displayed before a website may start a VR presentation."> - While you're in VR, this site may be able to learn about: - </message> - <message name="IDS_XR_CONSENT_BULLET" desc="Unicode bullet for list items. Similar to IDS_LIST_BULLET from desktop generated_resources"> - • <ph name="LIST_ITEM_TEXT">%s<ex>the layout of your room</ex></ph> - </message> - <message name="IDS_XR_CONSENT_DIALOG_DESCRIPTION_PHYSICAL_FEATURES" desc="Item for the bulleted list of potential concerns in the consent dialog indicating that physical features may be exposed."> - your physical features, such as height - </message> - <message name="IDS_XR_CONSENT_DIALOG_DESCRIPTION_FLOOR_PLAN" desc="Item for the bulleted list of potential concerns in the consent dialog indicating that phyiscal features may be exposed."> - the layout of your room - </message> - <message name="IDS_XR_CONSENT_DIALOG_BUTTON_ALLOW_AND_ENTER_VR" desc="Text on the button of a user consent dialog which allows a website to start a VR presentation"> - Enter VR - </message> -</grit-part> |