Chromium Code Reviews| 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="/people_page/lock_state_behavior.html"> | 4 <link rel="import" href="/people_page/lock_state_behavior.html"> |
| 5 <link rel="import" href="/people_page/password_prompt_dialog.html"> | 5 <link rel="import" href="/people_page/password_prompt_dialog.html"> |
| 6 <link rel="import" href="/people_page/setup_pin_dialog.html"> | 6 <link rel="import" href="/people_page/setup_pin_dialog.html"> |
| 7 <link rel="import" href="/prefs/prefs_behavior.html"> | 7 <link rel="import" href="/prefs/prefs_behavior.html"> |
| 8 <link rel="import" href="/route.html"> | 8 <link rel="import" href="/route.html"> |
| 9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 10 | 10 |
| 11 <dom-module id="settings-lock-screen"> | 11 <dom-module id="settings-lock-screen"> |
| 12 <template> | 12 <template> |
| 13 <style include="settings-shared"></style> | 13 <style include="settings-shared"></style> |
| 14 <style> | 14 <style> |
| 15 .radio-indent { | 15 .radio-indent { |
| 16 margin-left: 28px; | 16 margin-left: 28px; |
| 17 } | 17 } |
| 18 | 18 |
| 19 paper-button { | 19 paper-button { |
| 20 text-transform: none; | 20 text-transform: none; |
| 21 } | 21 } |
| 22 </style> | 22 </style> |
| 23 | 23 |
| 24 <div> | 24 <div> |
| 25 <div class="list-frame"> | 25 <div class="list-frame"> |
| 26 <paper-radio-group selected="{{selectedUnlockType}}"> | 26 <paper-radio-group selected="{{selectedUnlockType}}"> |
| 27 <paper-radio-button name="password"> | 27 <paper-radio-button name="password"> |
| 28 $i18n{lockScreenPasswordOnly} | 28 [[i18n('lockScreenPasswordOnly')]] |
|
jdufault
2016/08/11 18:34:10
Please add a TODO to revert these changes once we
xiaoyinh(OOO Sep 11-29)
2016/08/11 23:59:51
Done.
| |
| 29 </paper-radio-button> | 29 </paper-radio-button> |
| 30 <paper-radio-button name="pin+password"> | 30 <paper-radio-button name="pin+password"> |
| 31 $i18n{lockScreenPinOrPassword} | 31 [[i18n('lockScreenPinOrPassword')]] |
| 32 </paper-radio-button> | 32 </paper-radio-button> |
| 33 <div class="settings-box continuation radio-indent" | 33 <div class="settings-box continuation radio-indent" |
| 34 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> | 34 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> |
| 35 <paper-button is="action-link" on-tap="onConfigurePin_"> | 35 <paper-button is="action-link" on-tap="onConfigurePin_"> |
| 36 [[getSetupPinText_(hasPin)]] | 36 [[getSetupPinText_(hasPin)]] |
| 37 </paper-button> | 37 </paper-button> |
| 38 </div> | 38 </div> |
| 39 </paper-radio-group> | 39 </paper-radio-group> |
| 40 </div> | 40 </div> |
| 41 | 41 |
| 42 <div class="settings-box single-column"> | 42 <div class="settings-box single-column"> |
|
jdufault
2016/08/11 18:34:10
Should the hidden$ be on this div instead?
xiaoyinh(OOO Sep 11-29)
2016/08/11 23:59:51
Thanks Jacob. I could move it here. One thing is i
jdufault
2016/08/12 21:45:35
Okay, feel free to leave it wherever it visually l
xiaoyinh(OOO Sep 11-29)
2016/08/16 17:33:43
Done.
| |
| 43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 44 label="$i18n{enableScreenlock}"> | 44 label="$i18n{enableScreenlock}" hidden$="[[hideEnable Settings_()]]"> |
|
jdufault
2016/08/11 18:34:10
You can use the property directly instead of creat
jdufault
2016/08/11 18:34:10
nit: newline instead of wrapping
xiaoyinh(OOO Sep 11-29)
2016/08/11 23:59:50
Done.
xiaoyinh(OOO Sep 11-29)
2016/08/11 23:59:51
Done.
| |
| 45 </settings-checkbox> | 45 </settings-checkbox> |
| 46 </div> | 46 </div> |
| 47 | 47 |
| 48 <settings-password-prompt-dialog id="passwordPrompt" | 48 <settings-password-prompt-dialog id="passwordPrompt" |
| 49 on-close="onPasswordClosed_" | 49 on-close="onPasswordClosed_" |
| 50 set-modes="{{setModes_}}"> | 50 set-modes="{{setModes_}}"> |
| 51 </settings-password-prompt-dialog> | 51 </settings-password-prompt-dialog> |
| 52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" | 52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" |
| 53 set-modes="[[setModes_]]"> | 53 set-modes="[[setModes_]]"> |
| 54 </settings-setup-pin-dialog> | 54 </settings-setup-pin-dialog> |
| 55 </div> | 55 </div> |
| 56 </template> | 56 </template> |
| 57 | 57 |
| 58 <script src="lock_screen.js"></script> | 58 <script src="lock_screen.js"></script> |
| 59 </dom-module> | 59 </dom-module> |
| OLD | NEW |