Commit ce9e8d5d authored by Ossama Mahmoud's avatar Ossama Mahmoud Committed by Commit Bot

OOBE: Update fingerprint_setup_screen title and footer

Bug: 1130482
Change-Id: I1ea101821632f331e37e2ea0eecc04716a93b41f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532261Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826362}
parent f7fe35a0
...@@ -5136,10 +5136,7 @@ ...@@ -5136,10 +5136,7 @@
<!-- Strings for Oobe fingerprint enrollment screen --> <!-- Strings for Oobe fingerprint enrollment screen -->
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE" desc="The title of the dialog that allow users to register their fingerprint."> <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE" desc="The title of the dialog that allow users to register their fingerprint.">
Set up your fingerprint Set up your fingerprint to unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> faster
</message>
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_LOCATION_TITLE" desc="The title of the dialog that shows where the fingerprint sensor is.">
Set up your fingerprint
</message> </message>
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_POWER_BUTTON_DESCRIPTION" desc="The label that explains that the fingerprint sensor is in the power button."> <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_POWER_BUTTON_DESCRIPTION" desc="The label that explains that the fingerprint sensor is in the power button.">
Touch the power button with your finger Touch the power button with your finger
...@@ -5147,6 +5144,9 @@ ...@@ -5147,6 +5144,9 @@
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_GENERAL_DESCRIPTION" desc="The label that explains the location of the fingerprint sensor on the device."> <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_GENERAL_DESCRIPTION" desc="The label that explains the location of the fingerprint sensor on the device.">
Touch the fingerprint sensor with your finger Touch the fingerprint sensor with your finger
</message> </message>
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_FOOTER" desc="Footer message for the fingerprint setup screen">
Your fingerprint data is stored securely and never leaves your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
</message>
<message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_PROGRESS_TITLE" desc="The title of the dialog that shows where the fingerprint sensor is."> <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_PROGRESS_TITLE" desc="The title of the dialog that shows where the fingerprint sensor is.">
Lift, then touch again Lift, then touch again
</message> </message>
......
11bc40ec49d69e06a5f1129da1ec43891c20d10e
\ No newline at end of file
9d151e643bd4a4a6c1ff3ef6fb84b0ad6da02fc8 f256e5b231840df1d529f5694ef395226cdc477a
\ No newline at end of file \ No newline at end of file
...@@ -20,3 +20,6 @@ ...@@ -20,3 +20,6 @@
width: 100%; width: 100%;
} }
#footer-text {
color: var(--oobe-subheader-text-color);
}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="stylesheet" href="fingerprint_setup.css"> <link rel="stylesheet" href="fingerprint_setup.css">
<oobe-dialog id="setupFingerprint" role="dialog" for-step="start" <oobe-dialog id="setupFingerprint" role="dialog" for-step="start"
has-buttons footer-shrinkable has-buttons footer-shrinkable
title-key="placeFingerScreenTitle" title-key="setupFingerprintScreenTitle"
subtitle-key="setupFingerprintScreenDescription" subtitle-key="setupFingerprintScreenDescription"
aria-label$="[[i18nDynamic(locale, 'setupFingerprintScreenAriaLabel')]]"> aria-label$="[[i18nDynamic(locale, 'setupFingerprintScreenAriaLabel')]]">
<hd-iron-icon slot="oobe-icon" <hd-iron-icon slot="oobe-icon"
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<div id="sensorLocation"></div> <div id="sensorLocation"></div>
</template> </template>
</div> </div>
<div id="footer-text" class="content self-stretch" >
[[i18nDynamic(locale, 'setupFingerprintScreenFooter')]]
</div>
</div> </div>
<div slot="bottom-buttons" class="layout horizontal end-justified"> <div slot="bottom-buttons" class="layout horizontal end-justified">
<oobe-text-button id="skipStart" <oobe-text-button id="skipStart"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "chrome/browser/chromeos/login/screens/fingerprint_setup_screen.h" #include "chrome/browser/chromeos/login/screens/fingerprint_setup_screen.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "components/login/localized_values_builder.h" #include "components/login/localized_values_builder.h"
#include "ui/chromeos/devicetype_utils.h"
namespace chromeos { namespace chromeos {
...@@ -24,16 +25,18 @@ FingerprintSetupScreenHandler::~FingerprintSetupScreenHandler() = default; ...@@ -24,16 +25,18 @@ FingerprintSetupScreenHandler::~FingerprintSetupScreenHandler() = default;
void FingerprintSetupScreenHandler::DeclareLocalizedValues( void FingerprintSetupScreenHandler::DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) { ::login::LocalizedValuesBuilder* builder) {
builder->Add("setupFingerprintScreenTitle", builder->AddF("setupFingerprintScreenTitle",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE); IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE,
ui::GetChromeOSDeviceName());
builder->AddF("setupFingerprintScreenFooter",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_FOOTER,
ui::GetChromeOSDeviceName());
builder->Add("skipFingerprintSetup", builder->Add("skipFingerprintSetup",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_SKIP); IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_SKIP);
builder->Add("fingerprintSetupDone", builder->Add("fingerprintSetupDone",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_DONE); IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_DONE);
builder->Add("fingerprintSetupAddAnother", builder->Add("fingerprintSetupAddAnother",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_ADD_ANOTHER); IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_ADD_ANOTHER);
builder->Add("placeFingerScreenTitle",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_LOCATION_TITLE);
builder->Add("enrollmentProgressScreenTitle", builder->Add("enrollmentProgressScreenTitle",
IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_PROGRESS_TITLE); IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_PROGRESS_TITLE);
builder->Add("setupFingerprintEnrollmentSuccessTitle", builder->Add("setupFingerprintEnrollmentSuccessTitle",
......
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