Chromium Code Reviews| OLD | NEW | 
|---|---|
| (Empty) | |
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | |
| 4 <link rel="import" href="/people_page/lock_state_behavior.html"> | |
| 5 <link rel="import" href="/people_page/password_prompt_dialog.html"> | |
| 6 <link rel="import" href="/people_page/setup_pin_dialog.html"> | |
| 7 <link rel="import" href="/prefs/prefs_behavior.html"> | |
| 8 <link rel="import" href="/route.html"> | |
| 9 <link rel="import" href="/settings_shared_css.html"> | |
| 10 | |
| 11 <dom-module id="settings-lock-screen"> | |
| 12 <template> | |
| 13 <style include="settings-shared"></style> | |
| 14 <style> | |
| 15 .radio-indent { | |
| 16 margin-left: 28px; | |
| 17 } | |
| 18 | |
| 19 paper-button { | |
| 20 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-
 
 | |
| 21 } | |
| 22 </style> | |
| 23 | |
| 24 <div> | |
| 25 <div class="list-frame"> | |
| 26 <paper-radio-group selected="{{selectedUnlockType}}"> | |
| 27 <paper-radio-button name="password"> | |
| 28 $i18n{lockScreenPasswordOnly} | |
| 29 </paper-radio-button> | |
| 30 <paper-radio-button name="pin+password"> | |
| 31 $i18n{lockScreenPinOrPassword} | |
| 32 </paper-radio-button> | |
| 33 <div class="settings-box continuation radio-indent" | |
| 34 hidden$="[[!showSetupPin_(selectedUnlockType)]]"> | |
| 35 <paper-button is="action-link" on-tap="onConfigurePin_"> | |
| 36 [[getSetupPinText_(hasPin)]] | |
| 37 </paper-button> | |
| 38 </div> | |
| 39 </paper-radio-group> | |
| 40 </div> | |
| 41 | |
| 42 <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
 
 | |
| 43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | |
| 44 label="$i18n{enableScreenlock}"> | |
| 45 </settings-checkbox> | |
| 46 </div> | |
| 47 | |
| 48 <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.
 
 | |
| 49 on-close="onPasswordClosed_" | |
| 50 set-modes="{{setModes_}}"> | |
| 51 </settings-password-prompt-dialog> | |
| 52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" | |
| 53 set-modes="[[setModes_]]"> | |
| 54 </settings-setup-pin-dialog> | |
| 55 </div> | |
| 56 </template> | |
| 57 | |
| 58 <script src="lock_screen.js"></script> | |
| 59 </dom-module> | |
| OLD | NEW |