summaryrefslogtreecommitdiffstats
path: root/ui/login
diff options
context:
space:
mode:
authorisherman <isherman@chromium.org>2014-11-06 15:54:45 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-06 23:55:46 +0000
commit2f8c0b4bdc22b28cdbea1b2bb7e76514283c5d42 (patch)
tree9362ff96b02964d858936cb45a8282e7148454fd /ui/login
parentb6e04ae2bb7bbd66ef1e37679e1b276e4ef9ed9f (diff)
downloadchromium_src-2f8c0b4bdc22b28cdbea1b2bb7e76514283c5d42.zip
chromium_src-2f8c0b4bdc22b28cdbea1b2bb7e76514283c5d42.tar.gz
chromium_src-2f8c0b4bdc22b28cdbea1b2bb7e76514283c5d42.tar.bz2
[Smart Lock] Add temporary UI strings and assets for Tx power-based proximity detection.
These strings and assets will be updated when the final versions are available. Use temporary ones for now during development. BUG=403419 TEST=none R=tengs@chromium.org Review URL: https://codereview.chromium.org/702903005 Cr-Commit-Position: refs/heads/master@{#303126}
Diffstat (limited to 'ui/login')
-rw-r--r--ui/login/account_picker/user_pod_row.css15
-rw-r--r--ui/login/account_picker/user_pod_row.js2
2 files changed, 17 insertions, 0 deletions
diff --git a/ui/login/account_picker/user_pod_row.css b/ui/login/account_picker/user_pod_row.css
index b8c764d..246c1fb 100644
--- a/ui/login/account_picker/user_pod_row.css
+++ b/ui/login/account_picker/user_pod_row.css
@@ -259,6 +259,21 @@ html[dir=rtl] .main-pane {
background-image: url('chrome://theme/IDR_EASY_UNLOCK_LOCKED_PRESSED');
}
+.custom-icon-locked-with-proximity-hint {
+ background-image:
+ url('chrome://theme/IDR_EASY_UNLOCK_LOCKED_WITH_PROXIMITY_HINT');
+}
+
+.custom-icon-locked-with-proximity-hint.icon-with-tooltip:hover {
+ background-image:
+ url('chrome://theme/IDR_EASY_UNLOCK_LOCKED_WITH_PROXIMITY_HINT_HOVER');
+}
+
+.custom-icon-locked-with-proximity-hint.interactive-custom-icon:active {
+ background-image:
+ url('chrome://theme/IDR_EASY_UNLOCK_LOCKED_WITH_PROXIMITY_HINT_PRESSED');
+}
+
.custom-icon-unlocked {
background-image: url('chrome://theme/IDR_EASY_UNLOCK_UNLOCKED');
}
diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js
index fd3778d..ec32f89 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -191,6 +191,8 @@ cr.define('login', function() {
*/
UserPodCustomIcon.ICONS = [
{id: 'locked', class: 'custom-icon-locked'},
+ {id: 'locked-with-proximity-hint',
+ class: 'custom-icon-locked-with-proximity-hint'},
{id: 'unlocked', class: 'custom-icon-unlocked'},
{id: 'hardlocked', class: 'custom-icon-hardlocked'},
{id: 'spinner', class: 'custom-icon-spinner'}