Skip to content

GitLab

T
tangled
Commit fe7173b9 authored by Kyle Horimoto's avatar Kyle Horimoto
Browse files
Options

[CrOS PhoneHub] Update strings per UXImpl review feedback 

Includes updates to the Phone Hub onboarding flow, notification flow,
and settings UI.

Fixed: 1166387
Change-Id: I31f2467e765f37585a8eadd0c2a7b277536e7d38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2628740
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarRegan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843763}
parent e2cc39fb
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 31 deletions
ash/ash_strings.grd
View file @ fe7173b9
......@@ -1140,7 +1140,7 @@ This file contains the strings for ash.
Turn on Phone Hub
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION" desc="The description of the onboarding dialog that pops up for existing multidevice users to ask for permission when the user enables this feature.">
Extend your phone’s internet connection, control Do Not Disturb and locate your device. View active Chrome tabs from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
Connect to your phone’s hotspot, silence and locate your device, and view recent Chrome tabs open on your phone
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DISMISS_BUTTON" desc="Dimiss button on the onboarding dialog for user to opt out this feature.">
Dismiss
......@@ -1152,7 +1152,7 @@ This file contains the strings for ash.
Set up Phone Hub later
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2.">
Extend your phone’s internet connection, control Do Not Disturb and locate your phone. View active Chrome tabs from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
Connect to your phone’s hotspot, silence and locate your device, and view recent Chrome tabs open on your phone
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1.">
You can always set up later from Settings.
......@@ -1173,7 +1173,7 @@ This file contains the strings for ash.
Can't find your phone
</message>
<message name="IDS_ASH_PHONE_HUB_PHONE_DISCONNECTED_DIALOG_DESCRIPTION" desc="The description of the dialog that pops up when the Phone Hub feature is not available because there is currently no active connection to the phone. This message reminds users that Bluetooth must be enabled on the phone in order to use the feature.">
Looks like Bluetooth is turned off on your phone. Please turn on Bluetooth on your phone to use Phone Hub.
Check that Bluetooth is enabled on your phone to use Phone Hub
</message>
<message name="IDS_ASH_PHONE_HUB_PHONE_DISCONNECTED_DIALOG_REFRESH_BUTTON" desc="Refresh button on the disconnected dialog to retry the connection attempt to the phone.">
Refresh
......
ash/ash_strings_grd/IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION.png.sha1
View file @ fe7173b9
49d1877727962300a1e64f84ab41c96f1bcc31ae
\ No newline at end of file
7b8a3d82e12497527ce5b2df5d1ac2f5198ff633
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1.png.sha1
View file @ fe7173b9
962622fc21f95ff1f4b6af60f918c7f05ea36136
\ No newline at end of file
ccacdfe05d01df37e563f8e5ccffd3021be6300c
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_PHONE_HUB_PHONE_DISCONNECTED_DIALOG_DESCRIPTION.png.sha1
View file @ fe7173b9
5a0ea0877d50fb9bed2e05640f9170489c3b447a
\ No newline at end of file
9009fbc7fbb8c3e790a9748f05c3071f7fe2955b
\ No newline at end of file
ash/system/phonehub/onboarding_view.cc
View file @ fe7173b9
......@@ -75,9 +75,8 @@ class OnboardingMainView : public PhoneHubInterstitialView {
SetImage(*image);
SetTitle(
l10n_util::GetStringUTF16(IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_TITLE));
SetDescription(l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION,
ui::GetChromeOSDeviceName()));
SetDescription(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION));
// Add "Dismiss" and "Get started" buttons.
auto dismiss = std::make_unique<InterstitialViewButton>(
......@@ -135,9 +134,8 @@ class OnboardingDismissPromptView : public PhoneHubInterstitialView {
// Adds title and description.
SetTitle(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_TITLE));
base::string16 part1 = l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1,
ui::GetChromeOSDeviceName());
base::string16 part1 = l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1);
base::string16 part2 = l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2);
// Uses "\n" to create a newline separator between two text paragraphs.
......
chrome/app/os_settings_strings.grdp
View file @ fe7173b9
......@@ -2501,7 +2501,7 @@ Press an assigned switch to remove assignment.
Recent Chrome tabs
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SUMMARY" desc="Description of for the 'Phone Hub' setting. This feature lets the user stay productive on Chrome OS by ensuring that their phones' apps, content, and connectivity are available on their Chrome OS device.">
Extend the best of your Android phone to your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
Access your phone's capabilities from your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SUMMARY" desc="Description of for the 'Phone Hub Notifications' setting. This feature mirrors notifications from a connected Android phone to Chrome OS devices.">
View notifications from your chat apps on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
......@@ -2516,21 +2516,21 @@ Press an assigned switch to remove assignment.
Turn on Chrome Sync to view recent Chrome tabs from your phone
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_TITLE" desc="The title of the dialog containing the Phone Hub notification opt-in flow shown when the Phone Hub 'Notifications' toggle is switched on.">
Turn on notifications on your phone
View notifications from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_SUMMARY" desc="The summary of the dialog containing the Phone Hub notification opt-in flow shown when the Phone Hub 'Notifications' toggle is switched on.">
Receive notifications from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_SUMMARY" desc="The summary of the dialog containing the Phone Hub notification opt-in flow shown when the Phone Hub 'Notifications' toggle is switched on. Explains to the user that they need to grant permission to use notifications by enabling access to the Google Play Services app on their phone.">
To receive notifications from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, follow the instructions on your phone to grant notifications access to Google Play Services.
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_TITLE" desc="The title of the dialog containing the Phone Hub notification opt-in flow shown when the user needs to follow the setup flow instructions on their phone in order to start mirroring notifications from their phone to their Chromebook.">
Complete setup on your phone
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_SUMMARY" desc="The body text of the dialog containing the Phone Hub notification opt-in flow shown when the user needs to follow the setup flow instructions on their phone in order to start mirroring notifications from their phone to their Chromebook.">
Make sure your phone is nearby, unlocked, and has Bluetooth and Wi-Fi turned on. Follow steps on your phone to complete setup.
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_SUMMARY" desc="The summary of the dialog containing the Phone Hub notification opt-in flow shown after the user has started the flow. Explains to the user that they need to grant permission to use notifications by enabling access to the Google Play Services app on their phone.">
To receive notifications from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, follow the instructions on your phone to grant notifications access to Google Play Services.
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_CONNECTING_TITLE" desc="The title of the dialog containing the Phone Hub notification opt-in flow shown when the user has confirmed to enable the feature that will mirror phone notifications to their Chromebook.">
Connecting to your phone
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_INSTRUCTIONS" desc="The body text of the dialog containing the Phone Hub notification opt-in flow when the Phone Hub 'Notifications' toggle is switched on, and when the user has confirmed to turn on the feature.">
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_INSTRUCTIONS" desc="The second paragraph of text shown in the dialog containing the Phone Hub notification opt-in flow. Alerts the user that to enable notifications, they need to have their phone unlocked, nearby, and with Bluetooth/Wi-Fi on to complete setup.">
Make sure your phone is nearby, unlocked, and has Bluetooth and Wi-Fi turned on.
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_COMPLETED_TITLE" desc="The title of the dialog containing the Phone Hub notification opt-in flow when the feature is successfully turned on and notifications on their phone will now be mirrored to their Chromebook.">
......
chrome/app/os_settings_strings_grdp/IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_SUMMARY.png.sha1
View file @ fe7173b9
a654955f18c6c55be788e3fdb0384e0c18f3b46c
\ No newline at end of file
e78c46170a03691aa88aca33dae893fe79bfca0b
\ No newline at end of file
chrome/app/os_settings_strings_grdp/IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_TITLE.png.sha1
View file @ fe7173b9
a654955f18c6c55be788e3fdb0384e0c18f3b46c
\ No newline at end of file
e78c46170a03691aa88aca33dae893fe79bfca0b
\ No newline at end of file
chrome/app/os_settings_strings_grdp/IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_SUMMARY.png.sha1
View file @ fe7173b9
f0ce57678f6abed15a581f84788f303a82d5d665
\ No newline at end of file
ece003992a50969392f89dc49bfc8ff558d83b39
\ No newline at end of file
chrome/app/os_settings_strings_grdp/IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SUMMARY.png.sha1
View file @ fe7173b9
666eb9b018cee4e05ba058af7fe98336430d61ea
\ No newline at end of file
2e738c62e64cea39a7d2510e11f006d8e6e8c50c
\ No newline at end of file
chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_notification_access_setup_dialog.js
View file @ fe7173b9
......@@ -188,6 +188,9 @@ Polymer({
return this.setupState_ === null ||
this.setupState_ ===
NotificationAccessSetupOperationStatus.CONNECTION_REQUESTED ||
this.setupState_ ===
NotificationAccessSetupOperationStatus
.SENT_MESSAGE_TO_PHONE_AND_WAITING_FOR_RESPONSE ||
this.setupState_ === NotificationAccessSetupOperationStatus.CONNECTING;
},
......
chrome/browser/ui/webui/settings/chromeos/multidevice_section.cc
View file @ fe7173b9
......@@ -314,14 +314,10 @@ void MultiDeviceSection::AddLoadTimeData(
IDS_SETTINGS_MULTIDEVICE_WIFI_SYNC_CHROME_SYNC_LABEL},
{"multideviceWifiSyncLearnMoreLabel",
IDS_SETTINGS_MULTIDEVICE_WIFI_SYNC_LEARN_MORE_LABEL},
{"multideviceNotificationAccessSetupAckTitle",
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_TITLE},
{"multideviceNotificationAccessSetupConnectingTitle",
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_CONNECTING_TITLE},
{"multideviceNotificationAccessSetupAwaitingResponseTitle",
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_TITLE},
{"multideviceNotificationAccessSetupAwaitingResponseSummary",
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_SUMMARY},
{"multideviceNotificationAccessSetupInstructions",
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_INSTRUCTIONS},
{"multideviceNotificationAccessSetupCompletedTitle",
......@@ -420,9 +416,16 @@ void MultiDeviceSection::AddLoadTimeData(
ui::GetChromeOSDeviceName()));
html_source->AddString(
"multidevicePhoneHubNotificationsItemSummary",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SUMMARY,
ui::GetChromeOSDeviceName()));
ui::SubstituteChromeOSDeviceType(
IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SUMMARY));
html_source->AddString(
"multideviceNotificationAccessSetupAckTitle",
ui::SubstituteChromeOSDeviceType(
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_TITLE));
html_source->AddString(
"multideviceNotificationAccessSetupAwaitingResponseSummary",
ui::SubstituteChromeOSDeviceType(
IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_AWAITING_RESPONSE_SUMMARY));
html_source->AddString(
"multideviceNotificationAccessSetupAccessProhibitedSummary",
l10n_util::GetStringFUTF16(
......
chrome/test/data/webui/settings/chromeos/multidevice_notification_access_setup_dialog_tests.js
View file @ fe7173b9
......@@ -76,7 +76,7 @@ suite('Multidevice', () => {
simulateStatusChanged(NotificationAccessSetupOperationStatus.
SENT_MESSAGE_TO_PHONE_AND_WAITING_FOR_RESPONSE);
assertFalse(isSetupInstructionsShownSeparately());
assertTrue(isSetupInstructionsShownSeparately());
assertTrue(!!buttonContainer.querySelector('#cancelButton'));
assertFalse(!!buttonContainer.querySelector('#getStartedButton'));
assertFalse(!!buttonContainer.querySelector('#doneButton'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment