OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.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/icon.html"> | 5 <link rel="import" href="chrome://resources/html/icon.html"> |
6 <link rel="import" href="chrome://resources/html/polymer.html"> | 6 <link rel="import" href="chrome://resources/html/polymer.html"> |
7 <link rel="import" href="chrome://resources/html/util.html"> | 7 <link rel="import" href="chrome://resources/html/util.html"> |
8 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
180 [[syncStatus.statusText]] | 180 [[syncStatus.statusText]] |
181 </div> | 181 </div> |
182 </div> | 182 </div> |
183 <button class="subpage-arrow" is="paper-icon-button-light" | 183 <button class="subpage-arrow" is="paper-icon-button-light" |
184 aria-label="$i18n{sync}" | 184 aria-label="$i18n{sync}" |
185 aria-describedby="syncSecondary"></button> | 185 aria-describedby="syncSecondary"></button> |
186 </div> | 186 </div> |
187 </template> | 187 </template> |
188 | 188 |
189 <if expr="chromeos"> | 189 <if expr="chromeos"> |
190 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> | 190 <div class="settings-box two-line" actionable |
191 <div class="settings-box"> | 191 on-tap="onConfigureLockTap_"> |
192 <settings-toggle-button class="start" | 192 <div class="start"> |
193 pref="{{prefs.settings.enable_screen_lock}}" | 193 $i18n{lockScreenTitle} |
194 label="$i18n{enableScreenlock}"> | 194 <div class="secondary" id="lockScreenSecondary"> |
195 </settings-toggle-button> | 195 [[getPasswordState_(hasPin, |
196 prefs.settings.enable_screen_lock.value)]] | |
197 </div> | |
196 </div> | 198 </div> |
197 </template> | 199 <button id="lockScreenSubpageTrigger" class="subpage-arrow" |
198 | 200 is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" |
199 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 201 aria-describedby="lockScrenSecondary"></button> |
200 <div class="settings-box two-line" actionable | 202 </div> |
201 on-tap="onConfigureLockTap_"> | |
202 <div class="start"> | |
203 $i18n{lockScreenTitle} | |
204 <div class="secondary" id="lockScreenSecondary"> | |
205 [[getPasswordState_(hasPin, | |
206 prefs.settings.enable_screen_lock.value)]] | |
207 </div> | |
208 </div> | |
209 <button id="lockScreenSubpageTrigger" class="subpage-arrow" | |
210 is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" | |
211 aria-describedby="lockScrenSecondary"></button> | |
212 </div> | |
213 </template> | |
214 </if> | 203 </if> |
215 | 204 |
216 <div id="manage-other-people-subpage-trigger" | 205 <div id="manage-other-people-subpage-trigger" |
217 class="settings-box" on-tap="onManageOtherPeople_" actionable> | 206 class="settings-box" on-tap="onManageOtherPeople_" actionable> |
218 <div class="start">$i18n{manageOtherPeople}</div> | 207 <div class="start">$i18n{manageOtherPeople}</div> |
219 <button class="subpage-arrow" is="paper-icon-button-light" | 208 <button class="subpage-arrow" is="paper-icon-button-light" |
220 aria-label="$i18n{manageOtherPeople}"></button> | 209 aria-label="$i18n{manageOtherPeople}"></button> |
221 </div> | 210 </div> |
222 | 211 |
223 <if expr="not chromeos"> | 212 <if expr="not chromeos"> |
(...skipping 19 matching lines...) Expand all Loading... | |
243 <template is="dom-if" route-path="/syncSetup" | 232 <template is="dom-if" route-path="/syncSetup" |
244 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 233 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
245 <settings-subpage | 234 <settings-subpage |
246 associated-control="[[$$('#sync-status')]]" | 235 associated-control="[[$$('#sync-status')]]" |
247 page-title="$i18n{syncPageTitle}" | 236 page-title="$i18n{syncPageTitle}" |
248 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 237 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
249 <settings-sync-page></settings-sync-page> | 238 <settings-sync-page></settings-sync-page> |
250 </settings-subpage> | 239 </settings-subpage> |
251 </template> | 240 </template> |
252 <if expr="chromeos"> | 241 <if expr="chromeos"> |
253 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 242 <template is="dom-if" route-path="/lockScreen" no-search> |
254 <template is="dom-if" route-path="/lockScreen" no-search> | 243 <settings-subpage page-title="$i18n{lockScreenTitle}"> |
255 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 244 <settings-lock-screen |
256 <settings-lock-screen | 245 prefs="{{prefs}}"> |
257 prefs="{{prefs}}"> | 246 </settings-lock-screen> |
258 </settings-lock-screen> | 247 </settings-subpage> |
259 </settings-subpage> | 248 </template> |
260 </template> | 249 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
jdufault
2017/05/04 21:03:45
Do we need a dedicated route for setting up finger
sammiequon
2017/05/04 23:32:34
Yeah it's still possible for a user to navigate di
jdufault
2017/05/04 23:39:03
Can we just remove the route entirely? Do we have
| |
261 <template is="dom-if" route-path="/lockScreen/fingerprint" no-search> | 250 <template is="dom-if" route-path="/lockScreen/fingerprint" no-search> |
262 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> | 251 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> |
263 <settings-fingerprint-list></settings-fingerprint-list> | 252 <settings-fingerprint-list></settings-fingerprint-list> |
264 </settings-subpage> | 253 </settings-subpage> |
265 </template> | 254 </template> |
266 </template> | 255 </template> |
267 <template is="dom-if" route-path="/accounts"> | 256 <template is="dom-if" route-path="/accounts"> |
268 <settings-subpage | 257 <settings-subpage |
269 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 258 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
270 page-title="$i18n{usersPageTitle}"> | 259 page-title="$i18n{usersPageTitle}"> |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
341 | 330 |
342 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> | 331 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> |
343 <settings-import-data-dialog prefs="{{prefs}}" | 332 <settings-import-data-dialog prefs="{{prefs}}" |
344 on-close="onImportDataDialogClosed_"> | 333 on-close="onImportDataDialogClosed_"> |
345 </settings-import-data-dialog> | 334 </settings-import-data-dialog> |
346 </template> | 335 </template> |
347 | 336 |
348 </template> | 337 </template> |
349 <script src="people_page.js"></script> | 338 <script src="people_page.js"></script> |
350 </dom-module> | 339 </dom-module> |
OLD | NEW |