Commit f27c0aa5 authored by Anastasiia Nikolaienko's avatar Anastasiia Nikolaienko Committed by Commit Bot

Add EDU account labels

Add 'Education account' labels for secondary accounts for Child users
(Child users will be able to add only EDU accounts).

Bug: 1043108
Change-Id: I4fad5c5a3da32538cacdb7e7557f2756ceef4a7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007823
Commit-Queue: Anastasiia Nikolaienko <anastasiian@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarKush Sinha <sinhak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748141}
parent 4fe884b2
...@@ -2620,6 +2620,9 @@ ...@@ -2620,6 +2620,9 @@
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_ACCOUNT_REMOVED_MESSAGE" desc="Notification message after account removal."> <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ACCOUNT_REMOVED_MESSAGE" desc="Notification message after account removal.">
<ph name="EMAIL">$1<ex>abcd@google.com</ex></ph> was removed from this device <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph> was removed from this device
</message> </message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_EDUCATION_ACCOUNT" desc="Status label which indicates that specified account is EDU account.">
Education account
</message>
<message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON" desc="Text in the add fingerprint dialog telling users to place finger on the power button which is the sensor."> <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON" desc="Text in the add fingerprint dialog telling users to place finger on the power button which is the sensor.">
Touch the power button with your finger Touch the power button with your finger
</message> </message>
......
c683ad17914c9b29ef306bb68aa5b91bcbc76769
\ No newline at end of file
...@@ -192,10 +192,18 @@ ...@@ -192,10 +192,18 @@
</template> </template>
<!-- Else, display a hamburger menu for removing the account --> <!-- Else, display a hamburger menu for removing the account -->
<template is="dom-if" if="[[!item.isDeviceAccount]]"> <template is="dom-if" if="[[!item.isDeviceAccount]]">
<!-- Display EDU account labels on secondary accounts for Child
users -->
<template is="dom-if" if="[[isChildUser_]]" restamp>
<span class="management-status" id="edu-account-label"
aria-hidden="true">
$i18n{accountManagerEducationAccountLabel}
</span>
</template>
<cr-icon-button class="icon-more-vert" <cr-icon-button class="icon-more-vert"
title="[[getMoreActionsTitle_(item)]]" title="[[getMoreActionsTitle_(item)]]"
aria-label="[[getMoreActionsTitle_(item)]]" aria-label="[[getMoreActionsTitle_(item)]]"
aria-describedby$="fullName-[[index]]" aria-describedby$="fullName-[[index]] edu-account-label"
on-click="onAccountActionsMenuButtonTap_"> on-click="onAccountActionsMenuButtonTap_">
</cr-icon-button> </cr-icon-button>
</template> </template>
......
...@@ -34,6 +34,14 @@ Polymer({ ...@@ -34,6 +34,14 @@ Polymer({
* @private {?settings.Account} * @private {?settings.Account}
*/ */
actionMenuAccount_: Object, actionMenuAccount_: Object,
/** @private {boolean} */
isChildUser_: {
type: Boolean,
value() {
return loadTimeData.getBoolean('isChild');
},
},
}, },
/** @private {?settings.AccountManagerBrowserProxy} */ /** @private {?settings.AccountManagerBrowserProxy} */
......
...@@ -586,6 +586,8 @@ void AddAccountManagerPageStrings(content::WebUIDataSource* html_source) { ...@@ -586,6 +586,8 @@ void AddAccountManagerPageStrings(content::WebUIDataSource* html_source) {
{"accountListHeader", IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER}, {"accountListHeader", IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER},
{"accountManagerPrimaryAccountTooltip", {"accountManagerPrimaryAccountTooltip",
IDS_SETTINGS_ACCOUNT_MANAGER_PRIMARY_ACCOUNT_TOOLTIP}, IDS_SETTINGS_ACCOUNT_MANAGER_PRIMARY_ACCOUNT_TOOLTIP},
{"accountManagerEducationAccountLabel",
IDS_SETTINGS_ACCOUNT_MANAGER_EDUCATION_ACCOUNT},
{"removeAccountLabel", IDS_SETTINGS_ACCOUNT_MANAGER_REMOVE_ACCOUNT_LABEL}, {"removeAccountLabel", IDS_SETTINGS_ACCOUNT_MANAGER_REMOVE_ACCOUNT_LABEL},
{"addAccountLabel", IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL}, {"addAccountLabel", IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL},
{"accountManagerSecondaryAccountsDisabledText", {"accountManagerSecondaryAccountsDisabledText",
......
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