Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2523)

Unified Diff: chrome/browser/resources/settings/people_page/lock_screen.html

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Initial upload Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/people_page/lock_screen.html
diff --git a/chrome/browser/resources/settings/people_page/lock_screen.html b/chrome/browser/resources/settings/people_page/lock_screen.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc61d04e13578497cc501e903e8c203181c3da60
--- /dev/null
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -0,0 +1,59 @@
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="/people_page/lock_state_behavior.html">
+<link rel="import" href="/people_page/password_prompt_dialog.html">
+<link rel="import" href="/people_page/setup_pin_dialog.html">
+<link rel="import" href="/prefs/prefs_behavior.html">
+<link rel="import" href="/route.html">
+<link rel="import" href="/settings_shared_css.html">
+
+<dom-module id="settings-lock-screen">
+ <template>
+ <style include="settings-shared"></style>
+ <style>
+ .radio-indent {
+ margin-left: 28px;
+ }
+
+ paper-button {
+ text-transform: none;
tommycli 2016/08/05 17:46:18 What does this do?
jdufault 2016/08/05 20:59:51 Removes the all-caps from the "action-link" paper-
+ }
+ </style>
+
+ <div>
+ <div class="list-frame">
+ <paper-radio-group selected="{{selectedUnlockType}}">
+ <paper-radio-button name="password">
+ $i18n{lockScreenPasswordOnly}
+ </paper-radio-button>
+ <paper-radio-button name="pin+password">
+ $i18n{lockScreenPinOrPassword}
+ </paper-radio-button>
+ <div class="settings-box continuation radio-indent"
+ hidden$="[[!showSetupPin_(selectedUnlockType)]]">
+ <paper-button is="action-link" on-tap="onConfigurePin_">
+ [[getSetupPinText_(hasPin)]]
+ </paper-button>
+ </div>
+ </paper-radio-group>
+ </div>
+
+ <div class="settings-box single-column">
tommycli 2016/08/05 17:46:18 In the mocks, isn't this above the radio group?
jdufault 2016/08/05 20:59:51 That got changed around in the newest mocks (https
+ <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
+ label="$i18n{enableScreenlock}">
+ </settings-checkbox>
+ </div>
+
+ <settings-password-prompt-dialog id="passwordPrompt"
tommycli 2016/08/05 17:46:18 Is it intended that the "Confirm your password" di
jdufault 2016/08/05 20:59:51 I implemented it that way for simplicity, since if
tommycli 2016/08/09 16:15:36 Acknowledged. I'm always pro-simplicity.
+ on-close="onPasswordClosed_"
+ set-modes="{{setModes_}}">
+ </settings-password-prompt-dialog>
+ <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
+ set-modes="[[setModes_]]">
+ </settings-setup-pin-dialog>
+ </div>
+ </template>
+
+ <script src="lock_screen.js"></script>
+</dom-module>

Powered by Google App Engine
This is Rietveld 408576698