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

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

Issue 2862613003: md settings: Show lock screen when pin/fingerprint disabled. (Closed)
Patch Set: Fix patch set 2 errors. Created 3 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
index c67e6543aa2c371e254cd5258924997bfab05c28..6d7baf4e4e6a573f430703a6c108e364ad689c6c 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.html
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -42,33 +42,35 @@
</style>
<div>
- <div class="list-frame">
- <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}">
- <paper-radio-button name="password">
- <div class="start">
- $i18n{lockScreenPasswordOnly}
- <div class="secondary">
- $i18n{lockScreenHighSecurity}
+ <template is="dom-if" if="[[quickUnlockEnabled_]]">
+ <div class="list-frame">
+ <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}">
+ <paper-radio-button name="password">
+ <div class="start">
+ $i18n{lockScreenPasswordOnly}
+ <div class="secondary">
+ $i18n{lockScreenHighSecurity}
+ </div>
</div>
- </div>
- </paper-radio-button>
- <paper-radio-button name="pin+password">
- <div class="start">
- $i18n{lockScreenPinOrPassword}
- <div class="secondary">
- $i18n{lockScreenMediumSecurity}
+ </paper-radio-button>
+ <paper-radio-button name="pin+password">
+ <div class="start">
+ $i18n{lockScreenPinOrPassword}
+ <div class="secondary">
+ $i18n{lockScreenMediumSecurity}
+ </div>
</div>
- </div>
- <template is="dom-if"
- if="[[showConfigurePinButton_(selectedUnlockType)]]">
- <paper-button id="setupPinButton" class="secondary-button"
- on-tap="onConfigurePin_">
- [[getSetupPinText_(hasPin)]]
- </paper-button>
- </template>
- </paper-radio-button>
- </paper-radio-group>
- </div>
+ <template is="dom-if"
+ if="[[showConfigurePinButton_(selectedUnlockType)]]">
+ <paper-button id="setupPinButton" class="secondary-button"
+ on-tap="onConfigurePin_">
+ [[getSetupPinText_(hasPin)]]
+ </paper-button>
+ </template>
+ </paper-radio-button>
+ </paper-radio-group>
+ </div>
+ </template>
<div id="screenLockDiv" class="settings-box">
<settings-toggle-button class="start"
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698