| 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/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 8 <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/neon-animation/neon-ani
matable.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 13 <link rel="import" href="../controls/settings_toggle_button.html"> | 13 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 14 <link rel="import" href="sync_page.html"> | 14 <link rel="import" href="sync_page.html"> |
| 15 <link rel="import" href="profile_info_browser_proxy.html"> | 15 <link rel="import" href="profile_info_browser_proxy.html"> |
| 16 <link rel="import" href="sync_browser_proxy.html"> | 16 <link rel="import" href="sync_browser_proxy.html"> |
| 17 <link rel="import" href="../route.html"> | 17 <link rel="import" href="../route.html"> |
| 18 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 18 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 19 <link rel="import" href="../settings_page/settings_subpage.html"> | 19 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 20 <link rel="import" href="../settings_shared_css.html"> | 20 <link rel="import" href="../settings_shared_css.html"> |
| 21 | 21 |
| 22 <if expr="chromeos"> | 22 <if expr="chromeos"> |
| 23 <link rel="import" href="change_picture.html"> | 23 <link rel="import" href="change_picture.html"> |
| 24 <link rel="import" href="easy_unlock_browser_proxy.html"> | |
| 25 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | |
| 26 <link rel="import" href="fingerprint_list.html"> | 24 <link rel="import" href="fingerprint_list.html"> |
| 27 <link rel="import" href="lock_screen.html"> | 25 <link rel="import" href="lock_screen.html"> |
| 28 <link rel="import" href="lock_state_behavior.html"> | 26 <link rel="import" href="lock_state_behavior.html"> |
| 29 <link rel="import" href="users_page.html"> | 27 <link rel="import" href="users_page.html"> |
| 30 </if> | 28 </if> |
| 31 <if expr="not chromeos"> | 29 <if expr="not chromeos"> |
| 32 <link rel="import" href="import_data_dialog.html"> | 30 <link rel="import" href="import_data_dialog.html"> |
| 33 <link rel="import" href="manage_profile.html"> | 31 <link rel="import" href="manage_profile.html"> |
| 34 </if> | 32 </if> |
| 35 | 33 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 64 } | 62 } |
| 65 | 63 |
| 66 #sync-status:not([actionable]) .subpage-arrow { | 64 #sync-status:not([actionable]) .subpage-arrow { |
| 67 display: none; | 65 display: none; |
| 68 } | 66 } |
| 69 | 67 |
| 70 .settings-box[actionable] .sync-error { | 68 .settings-box[actionable] .sync-error { |
| 71 color: var(--settings-error-color); | 69 color: var(--settings-error-color); |
| 72 } | 70 } |
| 73 | 71 |
| 74 #easy-unlock .start { | |
| 75 /* Use padding to ensure taller content looks correct. */ | |
| 76 padding: 11px 0; | |
| 77 } | |
| 78 | |
| 79 .icon-container { | 72 .icon-container { |
| 80 display: flex; | 73 display: flex; |
| 81 flex-shrink: 0; | 74 flex-shrink: 0; |
| 82 justify-content: center; | 75 justify-content: center; |
| 83 width: 40px; | 76 width: 40px; |
| 84 } | 77 } |
| 85 | 78 |
| 86 /* Avoid orphaned english text (as requested by bettes@) */ | 79 /* Avoid orphaned english text (as requested by bettes@) */ |
| 87 #activity-controls .secondary { | 80 #activity-controls .secondary { |
| 88 max-width: 90%; | 81 max-width: 90%; |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 <div class="secondary" id="lockScreenSecondary"> | 232 <div class="secondary" id="lockScreenSecondary"> |
| 240 [[getPasswordState_(hasPin, | 233 [[getPasswordState_(hasPin, |
| 241 prefs.settings.enable_screen_lock.value)]] | 234 prefs.settings.enable_screen_lock.value)]] |
| 242 </div> | 235 </div> |
| 243 </div> | 236 </div> |
| 244 <button class="subpage-arrow" is="paper-icon-button-light" | 237 <button class="subpage-arrow" is="paper-icon-button-light" |
| 245 aria-label="$i18n{lockScreenTitle}" | 238 aria-label="$i18n{lockScreenTitle}" |
| 246 aria-describedby="lockScrenSecondary"></button> | 239 aria-describedby="lockScrenSecondary"></button> |
| 247 </div> | 240 </div> |
| 248 </template> | 241 </template> |
| 249 | |
| 250 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | |
| 251 <div id="easy-unlock" class="settings-box two-line"> | |
| 252 <div class="start"> | |
| 253 <div>$i18n{easyUnlockSectionTitle}</div> | |
| 254 <div class="secondary"> | |
| 255 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 256 $i18n{easyUnlockSetupIntro} | |
| 257 </template> | |
| 258 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 259 $i18n{easyUnlockDescription} | |
| 260 </template> | |
| 261 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | |
| 262 $i18n{learnMore} | |
| 263 </a> | |
| 264 <!-- TODO(dbeam): this should be 1 dom-if with a method instead | |
| 265 of 2 nested dom-ifs. --> | |
| 266 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 267 <template is="dom-if" | |
| 268 if="[[easyUnlockProximityDetectionAllowed_]]"> | |
| 269 <settings-toggle-button | |
| 270 pref="{{prefs.easy_unlock.proximity_required}}" | |
| 271 label="$i18n{easyUnlockRequireProximityLabel}"> | |
| 272 </settings-toggle-button> | |
| 273 </template> | |
| 274 </template> | |
| 275 </div> | |
| 276 </div> | |
| 277 <div class="secondary-action"> | |
| 278 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 279 <paper-button id="easyUnlockSetup" class="secondary-button" | |
| 280 on-tap="onEasyUnlockSetupTap_"> | |
| 281 $i18n{easyUnlockSetupButton} | |
| 282 </paper-button> | |
| 283 </template> | |
| 284 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 285 <paper-button id="easyUnlockTurnOff" class="secondary-button" | |
| 286 on-tap="onEasyUnlockTurnOffTap_"> | |
| 287 $i18n{easyUnlockTurnOffButton} | |
| 288 </paper-button> | |
| 289 </template> | |
| 290 </div> | |
| 291 </div> | |
| 292 </template> | |
| 293 </if> | 242 </if> |
| 294 | 243 |
| 295 <div id="manage-other-people-subpage-trigger" | 244 <div id="manage-other-people-subpage-trigger" |
| 296 class="settings-box" on-tap="onManageOtherPeople_" actionable> | 245 class="settings-box" on-tap="onManageOtherPeople_" actionable> |
| 297 <div class="start">$i18n{manageOtherPeople}</div> | 246 <div class="start">$i18n{manageOtherPeople}</div> |
| 298 <button class="subpage-arrow" is="paper-icon-button-light" | 247 <button class="subpage-arrow" is="paper-icon-button-light" |
| 299 aria-label="$i18n{manageOtherPeople}"></button> | 248 aria-label="$i18n{manageOtherPeople}"></button> |
| 300 </div> | 249 </div> |
| 301 | 250 |
| 302 <if expr="not chromeos"> | 251 <if expr="not chromeos"> |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 </if> | 370 </if> |
| 422 </dialog> | 371 </dialog> |
| 423 </template> | 372 </template> |
| 424 | 373 |
| 425 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> | 374 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> |
| 426 <settings-import-data-dialog prefs="{{prefs}}" | 375 <settings-import-data-dialog prefs="{{prefs}}" |
| 427 on-close="onImportDataDialogClosed_"> | 376 on-close="onImportDataDialogClosed_"> |
| 428 </settings-import-data-dialog> | 377 </settings-import-data-dialog> |
| 429 </template> | 378 </template> |
| 430 | 379 |
| 431 <if expr="chromeos"> | |
| 432 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | |
| 433 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | |
| 434 on-close="onEasyUnlockTurnOffDialogClose_"> | |
| 435 </easy-unlock-turn-off-dialog> | |
| 436 </template> | |
| 437 </if> | |
| 438 </template> | 380 </template> |
| 439 <script src="people_page.js"></script> | 381 <script src="people_page.js"></script> |
| 440 </dom-module> | 382 </dom-module> |
| OLD | NEW |