| 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"
|
|
|