Commit 3bec3fb0 authored by Jana Grill's avatar Jana Grill Committed by Commit Bot

Adjust ADB sideloading notification strings

Adjust ADB sideloading notification strings based on the feedback
received from the UX review.

Bug: 1125611
Change-Id: I80c049f3f89cfb5ba50222799af42b813a0f6efc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2396216Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Jana Grill <janagrill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805260}
parent a72ff528
...@@ -5791,15 +5791,18 @@ You can manage this account’s settings by installing the Family Link app on yo ...@@ -5791,15 +5791,18 @@ You can manage this account’s settings by installing the Family Link app on yo
ADB debugging disabled ADB debugging disabled
</message> </message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled, but that the administrator is not forcing a powerwash."> <message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled, but that the administrator is not forcing a powerwash.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> has disabled ADB debugging. No new applications can be sideloaded. <ph name="DOMAIN">$1<ex>google.com</ex></ph> has disabled ADB debugging. Once you restart your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>, you won't be able to sideload apps.
</message> </message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted."> <message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted.">
<ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted in 24 hours <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted in 24 hours
</message> </message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the administrator which will result in local data being deleted after 24 hours.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> is disabling ADB debugging. This will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph> in 24 hours. Back up any files you'd like to keep.
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted after reboot."> <message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted after reboot.">
<ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted
</message> </message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that that ADB sideloading has been disabled by the administrator which will result in local data being deleted after reboot."> <message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the administrator which will result in local data being deleted after reboot.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> is disabling ADB debugging, which will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>. Back up your files before restarting. <ph name="DOMAIN">$1<ex>google.com</ex></ph> is disabling ADB debugging, which will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>. Back up your files before restarting.
</message> </message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_RESTART_TO_POWERWASH" meaning="button label" desc="Button label to restart the device which will result in local data being deleted."> <message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_RESTART_TO_POWERWASH" meaning="button label" desc="Button label to restart the device which will result in local data being deleted.">
......
e7aea93f853e4df4b34d670c5c0968cedd37e02c 39bb041d146122d06e636a29d8059472efebeca5
\ No newline at end of file \ No newline at end of file
dd2aebf98fb54b31792a3532387f47b183ab20b0 1a6166e9d0cb112212e4ab4d04f1fba5069d4813
\ No newline at end of file \ No newline at end of file
d071261021643bf6cd7a3b59f53499a47a91ae1b 64169f2d96bc4a36256c988120c472fa6f91422e
\ No newline at end of file \ No newline at end of file
d071261021643bf6cd7a3b59f53499a47a91ae1b 64169f2d96bc4a36256c988120c472fa6f91422e
\ No newline at end of file \ No newline at end of file
...@@ -57,7 +57,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) { ...@@ -57,7 +57,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_TITLE); IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_TITLE);
text = l10n_util::GetStringFUTF16( text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE, IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE,
enterprise_display_domain); enterprise_display_domain, device_type);
notification_id = kAdbSideloadingDisallowedNotificationId; notification_id = kAdbSideloadingDisallowedNotificationId;
break; break;
case Type::kPowerwashPlanned: case Type::kPowerwashPlanned:
...@@ -65,7 +65,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) { ...@@ -65,7 +65,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_TITLE, IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_TITLE,
device_type); device_type);
text = l10n_util::GetStringFUTF16( text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_NOTIFICATION_MESSAGE, IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_MESSAGE,
enterprise_display_domain, device_type); enterprise_display_domain, device_type);
notification_id = kAdbSideloadingPowerwashPlannedNotificationId; notification_id = kAdbSideloadingPowerwashPlannedNotificationId;
break; break;
...@@ -74,7 +74,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) { ...@@ -74,7 +74,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_TITLE, IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_TITLE,
device_type); device_type);
text = l10n_util::GetStringFUTF16( text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_NOTIFICATION_MESSAGE, IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_MESSAGE,
enterprise_display_domain, device_type); enterprise_display_domain, device_type);
notification_id = kAdbSideloadingPowerwashOnRebootNotificationId; notification_id = kAdbSideloadingPowerwashOnRebootNotificationId;
pinned = true; pinned = true;
......
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