Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/html/action_link.html"> | 2 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 3 <link rel="import" href="chrome://resources/html/action_link_css.html"> | 3 <link rel="import" href="chrome://resources/html/action_link_css.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> |
| 7 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 9 <link rel="import" href="easy_unlock_browser_proxy.html"> | |
| 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | |
| 8 <link rel="import" href="fingerprint_browser_proxy.html"> | 11 <link rel="import" href="fingerprint_browser_proxy.html"> |
| 9 <link rel="import" href="lock_screen_constants.html"> | 12 <link rel="import" href="lock_screen_constants.html"> |
| 10 <link rel="import" href="lock_state_behavior.html"> | 13 <link rel="import" href="lock_state_behavior.html"> |
| 11 <link rel="import" href="password_prompt_dialog.html"> | 14 <link rel="import" href="password_prompt_dialog.html"> |
| 12 <link rel="import" href="setup_pin_dialog.html"> | 15 <link rel="import" href="setup_pin_dialog.html"> |
| 13 <link rel="import" href="../i18n_setup.html"> | 16 <link rel="import" href="../i18n_setup.html"> |
| 14 <link rel="import" href="../prefs/prefs_behavior.html"> | 17 <link rel="import" href="../prefs/prefs_behavior.html"> |
| 15 <link rel="import" href="../prefs/prefs.html"> | 18 <link rel="import" href="../prefs/prefs.html"> |
| 16 <link rel="import" href="../route.html"> | 19 <link rel="import" href="../route.html"> |
| 17 <link rel="import" href="../settings_shared_css.html"> | 20 <link rel="import" href="../settings_shared_css.html"> |
| 18 | 21 |
| 19 <dom-module id="settings-lock-screen"> | 22 <dom-module id="settings-lock-screen"> |
| 20 <template> | 23 <template> |
| 21 <style include="settings-shared action-link"> | 24 <style include="settings-shared action-link"> |
| 25 #easy-unlock .start { | |
|
jdufault
2017/04/06 21:04:45
nit: use easyUnlock for id name since that's what
sammiequon
2017/04/06 22:23:50
Done.
| |
| 26 /* Use padding to ensure taller content looks correct. */ | |
| 27 padding: 11px 0; | |
| 28 } | |
| 29 | |
| 22 .radio-indent { | 30 .radio-indent { |
| 23 -webkit-margin-start: 36px; | 31 -webkit-margin-start: 36px; |
| 24 } | 32 } |
| 25 </style> | 33 </style> |
| 26 | 34 |
| 27 <div> | 35 <div> |
| 28 <div class="list-frame"> | 36 <div class="list-frame"> |
| 29 <paper-radio-group selected="{{selectedUnlockType}}"> | 37 <paper-radio-group selected="{{selectedUnlockType}}"> |
| 30 <paper-radio-button name="password"> | 38 <paper-radio-button name="password"> |
| 31 $i18n{lockScreenPasswordOnly} | 39 $i18n{lockScreenPasswordOnly} |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 </div> | 76 </div> |
| 69 </div> | 77 </div> |
| 70 <button class="subpage-arrow" is="paper-icon-button-light" | 78 <button class="subpage-arrow" is="paper-icon-button-light" |
| 71 aria-label="$i18n{lockScreenEditFingerprints}" | 79 aria-label="$i18n{lockScreenEditFingerprints}" |
| 72 aria-describedby="lockScreenEditFingerprintsSecondary"></butto n> | 80 aria-describedby="lockScreenEditFingerprintsSecondary"></butto n> |
| 73 </div> | 81 </div> |
| 74 </iron-collapse> | 82 </iron-collapse> |
| 75 </div> | 83 </div> |
| 76 </template> | 84 </template> |
| 77 | 85 |
| 86 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | |
| 87 <div id="easy-unlock" class="settings-box two-line"> | |
| 88 <div class="start"> | |
| 89 <div>$i18n{easyUnlockSectionTitle}</div> | |
| 90 <div class="secondary"> | |
| 91 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 92 $i18n{easyUnlockSetupIntro} | |
| 93 </template> | |
| 94 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 95 $i18n{easyUnlockDescription} | |
| 96 </template> | |
| 97 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | |
| 98 $i18n{learnMore} | |
| 99 </a> | |
| 100 <!-- TODO(dbeam): this should be 1 dom-if with a method instead | |
| 101 of 2 nested dom-ifs. --> | |
| 102 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 103 <template is="dom-if" | |
| 104 if="[[easyUnlockProximityDetectionAllowed_]]"> | |
| 105 <settings-toggle-button | |
| 106 pref="{{prefs.easy_unlock.proximity_required}}" | |
| 107 label="$i18n{easyUnlockRequireProximityLabel}"> | |
| 108 </settings-toggle-button> | |
| 109 </template> | |
| 110 </template> | |
| 111 </div> | |
| 112 </div> | |
| 113 <div class="secondary-action"> | |
| 114 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 115 <paper-button id="easyUnlockSetup" class="secondary-button" | |
| 116 on-tap="onEasyUnlockSetupTap_"> | |
| 117 $i18n{easyUnlockSetupButton} | |
| 118 </paper-button> | |
| 119 </template> | |
| 120 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 121 <paper-button id="easyUnlockTurnOff" class="secondary-button" | |
| 122 on-tap="onEasyUnlockTurnOffTap_"> | |
| 123 $i18n{easyUnlockTurnOffButton} | |
| 124 </paper-button> | |
| 125 </template> | |
| 126 </div> | |
| 127 </div> | |
| 128 </template> | |
| 129 | |
| 78 <settings-password-prompt-dialog id="passwordPrompt" | 130 <settings-password-prompt-dialog id="passwordPrompt" |
| 79 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> | 131 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> |
| 80 </settings-password-prompt-dialog> | 132 </settings-password-prompt-dialog> |
| 133 | |
| 81 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" | 134 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" |
| 82 set-modes="[[setModes_]]"> | 135 set-modes="[[setModes_]]"> |
| 83 </settings-setup-pin-dialog> | 136 </settings-setup-pin-dialog> |
| 137 | |
| 138 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | |
| 139 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | |
| 140 on-close="onEasyUnlockTurnOffDialogClose_"> | |
| 141 </easy-unlock-turn-off-dialog> | |
| 142 </template> | |
| 84 </div> | 143 </div> |
| 85 </template> | 144 </template> |
| 86 | 145 |
| 87 <script src="lock_screen.js"></script> | 146 <script src="lock_screen.js"></script> |
| 88 </dom-module> | 147 </dom-module> |
| OLD | NEW |