OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/html/assert.html"> | 3 <link rel="import" href="chrome://resources/html/assert.html"> |
4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
-radio-group.html"> |
| 9 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
9 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
10 <link rel="import" href="easy_unlock_browser_proxy.html"> | 11 <link rel="import" href="easy_unlock_browser_proxy.html"> |
11 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 12 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
12 <link rel="import" href="fingerprint_browser_proxy.html"> | 13 <link rel="import" href="fingerprint_browser_proxy.html"> |
13 <link rel="import" href="lock_screen_constants.html"> | 14 <link rel="import" href="lock_screen_constants.html"> |
14 <link rel="import" href="lock_state_behavior.html"> | 15 <link rel="import" href="lock_state_behavior.html"> |
15 <link rel="import" href="password_prompt_dialog.html"> | 16 <link rel="import" href="password_prompt_dialog.html"> |
16 <link rel="import" href="setup_pin_dialog.html"> | 17 <link rel="import" href="setup_pin_dialog.html"> |
17 <link rel="import" href="../i18n_setup.html"> | 18 <link rel="import" href="../i18n_setup.html"> |
18 <link rel="import" href="../prefs/prefs_behavior.html"> | 19 <link rel="import" href="../prefs/prefs_behavior.html"> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 <div id="easyUnlock" class="settings-box two-line continuation"> | 129 <div id="easyUnlock" class="settings-box two-line continuation"> |
129 <div class="start"> | 130 <div class="start"> |
130 <div>$i18n{easyUnlockSectionTitle}</div> | 131 <div>$i18n{easyUnlockSectionTitle}</div> |
131 <div class="secondary"> | 132 <div class="secondary"> |
132 [[getEasyUnlockDescription_(easyUnlockEnabled_, | 133 [[getEasyUnlockDescription_(easyUnlockEnabled_, |
133 '$i18nPolymer{easyUnlockDescription}', | 134 '$i18nPolymer{easyUnlockDescription}', |
134 '$i18nPolymer{easyUnlockSetupIntro}')]] | 135 '$i18nPolymer{easyUnlockSetupIntro}')]] |
135 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | 136 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
136 $i18n{learnMore} | 137 $i18n{learnMore} |
137 </a> | 138 </a> |
138 <template is="dom-if" if="[[getShowEasyUnlockToggle_( | 139 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
139 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]"> | 140 <div class="setting-box"> |
140 <settings-toggle-button | 141 <div class="start"> |
141 pref="{{prefs.easy_unlock.proximity_required}}" | 142 $i18n{easyUnlockProximityThresholdLabel} |
142 label="$i18n{easyUnlockRequireProximityLabel}"> | 143 <settings-dropdown-menu |
143 </settings-toggle-button> | 144 pref="{{prefs.easy_unlock.proximity_threshold}}" |
| 145 menu-options="[[easyUnlockProximityThresholdMapping_]]"> |
| 146 </settings-dropdown-menu> |
| 147 </div> |
| 148 </div> |
144 </template> | 149 </template> |
145 </div> | 150 </div> |
146 </div> | 151 </div> |
147 <div class="separator"></div> | 152 <div class="separator"></div> |
148 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 153 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
149 <paper-button id="easyUnlockSetup" class="secondary-button" | 154 <paper-button id="easyUnlockSetup" class="secondary-button" |
150 on-tap="onEasyUnlockSetupTap_"> | 155 on-tap="onEasyUnlockSetupTap_"> |
151 $i18n{easyUnlockSetupButton} | 156 $i18n{easyUnlockSetupButton} |
152 </paper-button> | 157 </paper-button> |
153 </template> | 158 </template> |
154 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 159 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
155 <paper-button id="easyUnlockTurnOff" class="secondary-button" | 160 <paper-button id="easyUnlockTurnOff" class="secondary-button" |
(...skipping 19 matching lines...) Expand all Loading... |
175 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]" restamp> | 180 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]" restamp> |
176 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 181 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
177 on-close="onEasyUnlockTurnOffDialogClose_"> | 182 on-close="onEasyUnlockTurnOffDialogClose_"> |
178 </easy-unlock-turn-off-dialog> | 183 </easy-unlock-turn-off-dialog> |
179 </template> | 184 </template> |
180 </div> | 185 </div> |
181 </template> | 186 </template> |
182 | 187 |
183 <script src="lock_screen.js"></script> | 188 <script src="lock_screen.js"></script> |
184 </dom-module> | 189 </dom-module> |
OLD | NEW |