cros: Create resources grd for ash/login.
Also added strings and image for fingerprint unlock UI.
Bug: 835357
Change-Id: I8b7f1de78121cdef8b831f1fe2373674705cee7b
Reviewed-on: https://chromium-review.googlesource.com/1157064
Commit-Queue: Xiaoyin Hu <xiaoyinh@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579575}diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 0914a3f..7b99d2b 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -1504,6 +1504,12 @@
<message name="IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_MESSAGE" desc="Text shown in the user pod to remind user that fingerprint unlock is supported">
Unlock with fingerprint
</message>
+ <message name="IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_FAILED_MESSAGE" desc="Text shown in the user pod to tell user that couldn't unlock because finger is not recognized">
+ Not recognized
+ </message>
+ <message name="IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_DISABLED_MESSAGE" desc="Text shown in the user pod to tell user that fingerprint unlock has reached maximum attempt">
+ Too many attempts. Try again later.
+ </message>
<message name="IDS_ASH_LOGIN_TAKE_BREAK_MESSAGE" desc="Message shown to user when unlocking the device is not allowed because the time limit of using the device has reached.">
Take a break!
</message>
diff --git a/ash/login/resources/BUILD.gn b/ash/login/resources/BUILD.gn
new file mode 100644
index 0000000..1b97ea9
--- /dev/null
+++ b/ash/login/resources/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//tools/grit/grit_rule.gni")
+
+grit("resources") {
+ source = "login_resources.grd"
+ outputs = [
+ "grit/login_resources.h",
+ "grit/login_resources_map.cc",
+ "grit/login_resources_map.h",
+ "login_resources_100_percent.pak",
+ "login_resources_200_percent.pak",
+ "login_resources_300_percent.pak",
+ ]
+}
diff --git a/ash/login/resources/default_100_percent/common/fingerprint_unlock_spinner.png b/ash/login/resources/default_100_percent/common/fingerprint_unlock_spinner.png
new file mode 100644
index 0000000..b902076
--- /dev/null
+++ b/ash/login/resources/default_100_percent/common/fingerprint_unlock_spinner.png
Binary files differ
diff --git a/ash/login/resources/default_200_percent/common/fingerprint_unlock_spinner.png b/ash/login/resources/default_200_percent/common/fingerprint_unlock_spinner.png
new file mode 100644
index 0000000..78ec9fed
--- /dev/null
+++ b/ash/login/resources/default_200_percent/common/fingerprint_unlock_spinner.png
Binary files differ
diff --git a/ash/login/resources/login_resources.grd b/ash/login/resources/login_resources.grd
new file mode 100644
index 0000000..7187ec6
--- /dev/null
+++ b/ash/login/resources/login_resources.grd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
+ <outputs>
+ <output filename="grit/login_resources.h" type="rc_header" context="default_100_percent">
+ <emit emit_type='prepend'></emit>
+ </output>
+ <output filename="grit/login_resources_map.cc" type="resource_map_source" context="default_100_percent" />
+ <output filename="grit/login_resources_map.h" type="resource_map_header" context="default_100_percent" />
+ <output filename="login_resources_100_percent.pak" type="data_package" context="default_100_percent" />
+ <output filename="login_resources_200_percent.pak" type="data_package" context="default_200_percent" />
+ <output filename="login_resources_300_percent.pak" type="data_package" context="default_300_percent" />
+ </outputs>
+ <release seq="1">
+ <structures fallback_to_low_resolution="true">
+ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
+ BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
+ SAME CONDITIONALS. -->
+ <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_UNLOCK_SPINNER" file="common/fingerprint_unlock_spinner.png" />
+ </structures>
+ </release>
+</grit>
diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn
index 5f807a8..314655e 100644
--- a/ash/resources/BUILD.gn
+++ b/ash/resources/BUILD.gn
@@ -20,6 +20,7 @@
sources = [
"$root_gen_dir/ash/app_list/resources/app_list_resources_${percent}_percent.pak",
"$root_gen_dir/ash/components/resources/ash_components_resources_${percent}_percent.pak",
+ "$root_gen_dir/ash/login/resources/login_resources_${percent}_percent.pak",
"$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak",
"$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
@@ -40,6 +41,7 @@
deps = [
"//ash/app_list/resources",
"//ash/components/resources",
+ "//ash/login/resources",
"//ash/public/cpp/resources:ash_public_unscaled_resources",
"//mojo/public/js:resources",
"//ui/chromeos/resources",
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index eca08ff7..8b3d165 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -59,10 +59,12 @@
if (is_chromeos) {
sources += [
"$root_gen_dir/ash/components/resources/ash_components_resources_${percent}_percent.pak",
+ "$root_gen_dir/ash/login/resources/login_resources_${percent}_percent.pak",
"$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak",
]
deps += [
"//ash/components/resources",
+ "//ash/login/resources",
"//ui/chromeos/resources",
]
}
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index efa6e5c..39f2fbb 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -360,6 +360,11 @@
"ash/app_list/resources/app_list_resources.grd": {
"structures": [25900],
},
+
+ "ash/login/resources/login_resources.grd": {
+ "structures": [25910],
+ },
+
"ui/chromeos/resources/ui_chromeos_resources.grd": {
"structures": [25920],
},
