Merge subhead and footer note on fingerprint-setup

Merge the privacy disclaimer footer note with the subheader
in the fingerprint-setup initial screen.

Bug: 1096679
Change-Id: I7f179931e57a6bcdfc8c60c494ddf6dd37a4f7c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612972
Commit-Queue: Ossama Mahmoud <osamafathy@google.com>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842973}

chrome/app/chromeos_strings.grdp

@@ -5014,16 +5014,13 @@
 
   <!-- 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.">
-    Set up your fingerprint to unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> faster
+    Unlock faster with your fingerprint
   </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.">
-    Touch the power button with your finger
+    Touch the power button with your finger. Your 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_SENSOR_GENERAL_DESCRIPTION" desc="The label that explains the location of the fingerprint sensor on the device.">
-      Touch the fingerprint sensor with your finger
-  </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>.
+    Touch the fingerprint sensor with your finger. Your 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.">
     Lift, then touch again
@@ -5052,10 +5049,10 @@
   <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME_3" desc="The default name for third newly added fingerprint.">
     Finger 3
   </message>
-  <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_INSTRUCTION_MOVE_FINGER" desc="Text in the fingerprint setup screen telling users what to move finger to capture the different parts of fingerprint.">
-    Move your finger slightly to add the different parts of your fingerprint.
+  <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_INSTRUCTION_MOVE_FINGER" desc="Text in the fingerprint setup screen telling users to lift their finger to capture the different parts of fingerprint.">
+    Keep lifting your finger to add the different parts of your fingerprint
   </message>
-  <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_INSTRUCTION_TRY_AGAIN" desc="Text in the fingerprint setup screen telling users what to scan their finger again.">
+  <message name="IDS_OOBE_FINGERPINT_SETUP_SCREEN_INSTRUCTION_TRY_AGAIN" desc="Text in the fingerprint setup screen telling users to scan their finger again.">
     Try again.
   </message>
 

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_FOOTER.png.sha1

-11bc40ec49d69e06a5f1129da1ec43891c20d10e
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_INSTRUCTION_MOVE_FINGER.png.sha1

-0aa420cbdd6f271aa13288688e3fe83347f649b2
+40eafc15947667ce759612e53e37039ab57fde3a
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_DESCRIPTION.png.sha1

-0aa420cbdd6f271aa13288688e3fe83347f649b2
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_GENERAL_DESCRIPTION.png.sha1

+fc343e6f384fb9347d483de80e0722e70cb8540a
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_SENSOR_POWER_BUTTON_DESCRIPTION.png.sha1

+4b1e922d26d25d7bbd1d4f99c44a802f619a8116
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE.png.sha1

-f256e5b231840df1d529f5694ef395226cdc477a
+4b1e922d26d25d7bbd1d4f99c44a802f619a8116
\ No newline at end of file

chrome/browser/resources/chromeos/login/fingerprint_setup.html

@@ -37,9 +37,6 @@
             <div id="sensorLocation"></div>
           </template>
         </div>
-        <div id="footer-text" class="content self-stretch" >
-          [[i18nDynamic(locale, 'setupFingerprintScreenFooter')]]
-        </div>
       </div>
       <div slot="bottom-buttons" class="layout horizontal end-justified">
         <oobe-text-button id="skipStart"

chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.cc

@@ -25,12 +25,8 @@ FingerprintSetupScreenHandler::~FingerprintSetupScreenHandler() = default;
 
 void FingerprintSetupScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
-  builder->AddF("setupFingerprintScreenTitle",
-                IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE,
-                ui::GetChromeOSDeviceName());
-  builder->AddF("setupFingerprintScreenFooter",
-                IDS_OOBE_FINGERPINT_SETUP_SCREEN_ENROLLMENT_FOOTER,
-                ui::GetChromeOSDeviceName());
+  builder->Add("setupFingerprintScreenTitle",
+               IDS_OOBE_FINGERPINT_SETUP_SCREEN_TITLE);
   builder->Add("skipFingerprintSetup",
                IDS_OOBE_FINGERPINT_SETUP_SCREEN_BUTTON_SKIP);
   builder->Add("fingerprintSetupDone",
@@ -75,7 +71,8 @@ void FingerprintSetupScreenHandler::DeclareLocalizedValues(
           IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_TOP_RIGHT_ARIA_LABEL;
       break;
   }
-  builder->Add("setupFingerprintScreenDescription", description_id);
+  builder->AddF("setupFingerprintScreenDescription", description_id,
+                ui::GetChromeOSDeviceName());
   builder->Add("setupFingerprintScreenAriaLabel", aria_label_id);
 }