| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.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"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> |
| 5 <link rel="import" href="/controls/settings_toggle_button.html"> | 5 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 6 <link rel="import" href="/people_page/fingerprint_list.html"> |
| 6 <link rel="import" href="/people_page/lock_screen_constants.html"> | 7 <link rel="import" href="/people_page/lock_screen_constants.html"> |
| 7 <link rel="import" href="/people_page/lock_state_behavior.html"> | 8 <link rel="import" href="/people_page/lock_state_behavior.html"> |
| 8 <link rel="import" href="/people_page/password_prompt_dialog.html"> | 9 <link rel="import" href="/people_page/password_prompt_dialog.html"> |
| 9 <link rel="import" href="/people_page/setup_pin_dialog.html"> | 10 <link rel="import" href="/people_page/setup_pin_dialog.html"> |
| 10 <link rel="import" href="/prefs/prefs_behavior.html"> | 11 <link rel="import" href="/prefs/prefs_behavior.html"> |
| 11 <link rel="import" href="/route.html"> | 12 <link rel="import" href="/route.html"> |
| 12 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 13 | 14 |
| 14 <dom-module id="settings-lock-screen"> | 15 <dom-module id="settings-lock-screen"> |
| 15 <template> | 16 <template> |
| 16 <style include="settings-shared"></style> | 17 <style include="settings-shared"></style> |
| 17 <style> | 18 <style> |
| 18 .radio-indent { | 19 .radio-indent { |
| 19 margin-left: 28px; | 20 margin-left: 28px; |
| 20 } | 21 } |
| 21 | 22 |
| 22 paper-button { | 23 paper-button { |
| 23 text-transform: none; | 24 text-transform: none; |
| 24 } | 25 } |
| 25 </style> | 26 </style> |
| 26 | 27 |
| 27 <div> | 28 <div> |
| 28 <div class="list-frame"> | 29 <template is="dom-if" if="[[pinUnlockEnabled_]]"> |
| 29 <paper-radio-group selected="{{selectedUnlockType}}"> | 30 <div class="list-frame"> |
| 30 <paper-radio-button name="password"> | 31 <paper-radio-group selected="{{selectedUnlockType}}"> |
| 31 $i18n{lockScreenPasswordOnly} | 32 <paper-radio-button name="password"> |
| 32 </paper-radio-button> | 33 $i18n{lockScreenPasswordOnly} |
| 33 <paper-radio-button name="pin+password"> | 34 </paper-radio-button> |
| 34 $i18n{lockScreenPinOrPassword} | 35 <paper-radio-button name="pin+password"> |
| 35 </paper-radio-button> | 36 $i18n{lockScreenPinOrPassword} |
| 36 <div class="settings-box continuation radio-indent" | 37 </paper-radio-button> |
| 37 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> | 38 <div class="settings-box continuation radio-indent" |
| 38 <!-- TODO(dbeam): I seriously doubt paper-button[is=action-link] is | 39 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> |
| 39 a good idea. --> | 40 <paper-button is="action-link" on-tap="onConfigurePin_"> |
| 40 <paper-button is="action-link" on-tap="onConfigurePin_"> | 41 [[getSetupPinText_(hasPin)]] |
| 41 [[getSetupPinText_(hasPin)]] | 42 </paper-button> |
| 42 </paper-button> | 43 </div> |
| 44 </paper-radio-group> |
| 45 </div> |
| 46 </template> |
| 47 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
| 48 <div class="settings-box"> |
| 49 <settings-toggle-button class="start" |
| 50 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" |
| 51 label="$i18n{lockScreenFingerprintEnable}"> |
| 52 </settings-toggle-button> |
| 53 </div> |
| 54 <iron-collapse |
| 55 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> |
| 56 <div class="settings-box continuation"> |
| 57 <settings-fingerprint-list></settings-fingerprint-list> |
| 43 </div> | 58 </div> |
| 44 </paper-radio-group> | 59 </iron-collapse> |
| 45 </div> | 60 </template> |
| 46 | 61 |
| 47 <div class="settings-box"> | 62 <div class="settings-box"> |
| 48 <settings-toggle-button class="start" | 63 <settings-toggle-button class="start" |
| 49 pref="{{prefs.settings.enable_screen_lock}}" | 64 pref="{{prefs.settings.enable_screen_lock}}" |
| 50 label="$i18n{enableScreenlock}"> | 65 label="$i18n{enableScreenlock}"> |
| 51 </settings-toggle-button> | 66 </settings-toggle-button> |
| 52 </div> | 67 </div> |
| 53 | 68 |
| 54 <settings-password-prompt-dialog id="passwordPrompt" | 69 <settings-password-prompt-dialog id="passwordPrompt" |
| 55 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> | 70 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> |
| 56 </settings-password-prompt-dialog> | 71 </settings-password-prompt-dialog> |
| 57 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" | 72 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" |
| 58 set-modes="[[setModes_]]"> | 73 set-modes="[[setModes_]]"> |
| 59 </settings-setup-pin-dialog> | 74 </settings-setup-pin-dialog> |
| 60 </div> | 75 </div> |
| 61 </template> | 76 </template> |
| 62 | 77 |
| 63 <script src="lock_screen.js"></script> | 78 <script src="lock_screen.js"></script> |
| 64 </dom-module> | 79 </dom-module> |
| OLD | NEW |