| 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/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> |
| 6 <link rel="import" href="../controls/settings_toggle_button.html"> | 6 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 7 <link rel="import" href="easy_unlock_browser_proxy.html"> | 7 <link rel="import" href="easy_unlock_browser_proxy.html"> |
| 8 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 8 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
| 9 <link rel="import" href="fingerprint_browser_proxy.html"> | 9 <link rel="import" href="fingerprint_browser_proxy.html"> |
| 10 <link rel="import" href="lock_screen_constants.html"> | 10 <link rel="import" href="lock_screen_constants.html"> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 width: 100%; | 33 width: 100%; |
| 34 }; | 34 }; |
| 35 } | 35 } |
| 36 | 36 |
| 37 paper-radio-button > .start { | 37 paper-radio-button > .start { |
| 38 flex: 1; | 38 flex: 1; |
| 39 } | 39 } |
| 40 </style> | 40 </style> |
| 41 | 41 |
| 42 <div> | 42 <div> |
| 43 <div class="list-frame"> | 43 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 44 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | 44 <div class="list-frame"> |
| 45 <paper-radio-button name="password"> | 45 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> |
| 46 <div class="start"> | 46 <paper-radio-button name="password"> |
| 47 $i18n{lockScreenPasswordOnly} | 47 <div class="start"> |
| 48 <div class="secondary"> | 48 $i18n{lockScreenPasswordOnly} |
| 49 $i18n{lockScreenHighSecurity} | 49 <div class="secondary"> |
| 50 $i18n{lockScreenHighSecurity} |
| 51 </div> |
| 50 </div> | 52 </div> |
| 51 </div> | 53 </paper-radio-button> |
| 52 </paper-radio-button> | 54 <paper-radio-button name="pin+password"> |
| 53 <paper-radio-button name="pin+password"> | 55 <div class="start"> |
| 54 <div class="start"> | 56 $i18n{lockScreenPinOrPassword} |
| 55 $i18n{lockScreenPinOrPassword} | 57 <div class="secondary"> |
| 56 <div class="secondary"> | 58 $i18n{lockScreenMediumSecurity} |
| 57 $i18n{lockScreenMediumSecurity} | 59 </div> |
| 58 </div> | 60 </div> |
| 59 </div> | 61 <template is="dom-if" |
| 60 <template is="dom-if" | 62 if="[[showConfigurePinButton_(selectedUnlockType)]]"> |
| 61 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | 63 <paper-button id="setupPinButton" class="secondary-button" |
| 62 <paper-button id="setupPinButton" class="secondary-button" | 64 on-tap="onConfigurePin_"> |
| 63 on-tap="onConfigurePin_"> | 65 [[getSetupPinText_(hasPin)]] |
| 64 [[getSetupPinText_(hasPin)]] | 66 </paper-button> |
| 65 </paper-button> | 67 </template> |
| 66 </template> | 68 </paper-radio-button> |
| 67 </paper-radio-button> | 69 </paper-radio-group> |
| 68 </paper-radio-group> | 70 </div> |
| 69 </div> | 71 </template> |
| 70 | 72 |
| 71 <div id="screenLockDiv" class="settings-box"> | 73 <div id="screenLockDiv" class="settings-box"> |
| 72 <settings-toggle-button class="start" | 74 <settings-toggle-button class="start" |
| 73 pref="{{prefs.settings.enable_screen_lock}}" | 75 pref="{{prefs.settings.enable_screen_lock}}" |
| 74 label="$i18n{enableScreenlock}"> | 76 label="$i18n{enableScreenlock}"> |
| 75 </settings-toggle-button> | 77 </settings-toggle-button> |
| 76 </div> | 78 </div> |
| 77 | 79 |
| 78 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 80 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
| 79 <div id="fingerprintDiv"> | 81 <div id="fingerprintDiv"> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 150 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 149 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 151 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 150 on-close="onEasyUnlockTurnOffDialogClose_"> | 152 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 151 </easy-unlock-turn-off-dialog> | 153 </easy-unlock-turn-off-dialog> |
| 152 </template> | 154 </template> |
| 153 </div> | 155 </div> |
| 154 </template> | 156 </template> |
| 155 | 157 |
| 156 <script src="lock_screen.js"></script> | 158 <script src="lock_screen.js"></script> |
| 157 </dom-module> | 159 </dom-module> |
| OLD | NEW |