Commit f5f60fe8 authored by Sarah Hu's avatar Sarah Hu Committed by Commit Bot

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: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579575}
parent a9b5fb66
...@@ -1504,6 +1504,12 @@ This file contains the strings for ash. ...@@ -1504,6 +1504,12 @@ This file contains the strings for ash.
<message name="IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_MESSAGE" desc="Text shown in the user pod to remind user that fingerprint unlock is supported"> <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 Unlock with fingerprint
</message> </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."> <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! Take a break!
</message> </message>
......
# 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",
]
}
<?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>
...@@ -20,6 +20,7 @@ template("ash_test_resources") { ...@@ -20,6 +20,7 @@ template("ash_test_resources") {
sources = [ sources = [
"$root_gen_dir/ash/app_list/resources/app_list_resources_${percent}_percent.pak", "$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/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/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/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
...@@ -40,6 +41,7 @@ template("ash_test_resources") { ...@@ -40,6 +41,7 @@ template("ash_test_resources") {
deps = [ deps = [
"//ash/app_list/resources", "//ash/app_list/resources",
"//ash/components/resources", "//ash/components/resources",
"//ash/login/resources",
"//ash/public/cpp/resources:ash_public_unscaled_resources", "//ash/public/cpp/resources:ash_public_unscaled_resources",
"//mojo/public/js:resources", "//mojo/public/js:resources",
"//ui/chromeos/resources", "//ui/chromeos/resources",
......
...@@ -59,10 +59,12 @@ template("chrome_repack_percent") { ...@@ -59,10 +59,12 @@ template("chrome_repack_percent") {
if (is_chromeos) { if (is_chromeos) {
sources += [ sources += [
"$root_gen_dir/ash/components/resources/ash_components_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/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak", "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak",
] ]
deps += [ deps += [
"//ash/components/resources", "//ash/components/resources",
"//ash/login/resources",
"//ui/chromeos/resources", "//ui/chromeos/resources",
] ]
} }
......
...@@ -360,6 +360,11 @@ ...@@ -360,6 +360,11 @@
"ash/app_list/resources/app_list_resources.grd": { "ash/app_list/resources/app_list_resources.grd": {
"structures": [25900], "structures": [25900],
}, },
"ash/login/resources/login_resources.grd": {
"structures": [25910],
},
"ui/chromeos/resources/ui_chromeos_resources.grd": { "ui/chromeos/resources/ui_chromeos_resources.grd": {
"structures": [25920], "structures": [25920],
}, },
......
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