| 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/neon-animation/neon-ani
matable.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 11 <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-button/paper-butt
on.html"> |
| 12 <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-checkbox/paper-ch
eckbox.html"> |
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 14 <link rel="import" href="../controls/settings_toggle_button.html"> | 14 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 15 <link rel="import" href="sync_page.html"> | 15 <link rel="import" href="sync_page.html"> |
| 16 <link rel="import" href="profile_info_browser_proxy.html"> | 16 <link rel="import" href="profile_info_browser_proxy.html"> |
| 17 <link rel="import" href="sync_browser_proxy.html"> | 17 <link rel="import" href="sync_browser_proxy.html"> |
| 18 <link rel="import" href="../route.html"> | 18 <link rel="import" href="../route.html"> |
| 19 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 19 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 20 <link rel="import" href="../settings_page/settings_subpage.html"> | 20 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 21 <link rel="import" href="../settings_shared_css.html"> | 21 <link rel="import" href="../settings_shared_css.html"> |
| 22 | 22 |
| 23 <if expr="chromeos"> | 23 <if expr="chromeos"> |
| 24 <link rel="import" href="change_picture.html"> | 24 <link rel="import" href="change_picture.html"> |
| 25 <link rel="import" href="easy_unlock_browser_proxy.html"> | |
| 26 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | |
| 27 <link rel="import" href="fingerprint_list.html"> | 25 <link rel="import" href="fingerprint_list.html"> |
| 28 <link rel="import" href="lock_screen.html"> | 26 <link rel="import" href="lock_screen.html"> |
| 29 <link rel="import" href="lock_state_behavior.html"> | 27 <link rel="import" href="lock_state_behavior.html"> |
| 30 <link rel="import" href="users_page.html"> | 28 <link rel="import" href="users_page.html"> |
| 31 </if> | 29 </if> |
| 32 <if expr="not chromeos"> | 30 <if expr="not chromeos"> |
| 33 <link rel="import" href="import_data_dialog.html"> | 31 <link rel="import" href="import_data_dialog.html"> |
| 34 <link rel="import" href="manage_profile.html"> | 32 <link rel="import" href="manage_profile.html"> |
| 35 </if> | 33 </if> |
| 36 | 34 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 65 } | 63 } |
| 66 | 64 |
| 67 #sync-status:not([actionable]) .subpage-arrow { | 65 #sync-status:not([actionable]) .subpage-arrow { |
| 68 display: none; | 66 display: none; |
| 69 } | 67 } |
| 70 | 68 |
| 71 .settings-box[actionable] .sync-error { | 69 .settings-box[actionable] .sync-error { |
| 72 color: var(--settings-error-color); | 70 color: var(--settings-error-color); |
| 73 } | 71 } |
| 74 | 72 |
| 75 #easy-unlock .start { | |
| 76 /* Use padding to ensure taller content looks correct. */ | |
| 77 padding: 11px 0; | |
| 78 } | |
| 79 | |
| 80 .icon-container { | 73 .icon-container { |
| 81 display: flex; | 74 display: flex; |
| 82 flex-shrink: 0; | 75 flex-shrink: 0; |
| 83 justify-content: center; | 76 justify-content: center; |
| 84 width: 40px; | 77 width: 40px; |
| 85 } | 78 } |
| 86 | 79 |
| 87 #disconnectDialog .footer .settings-box { | 80 #disconnectDialog .footer .settings-box { |
| 88 --settings-box-row-padding: 0; | 81 --settings-box-row-padding: 0; |
| 89 } | 82 } |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 <div class="secondary" id="lockScreenSecondary"> | 204 <div class="secondary" id="lockScreenSecondary"> |
| 212 [[getPasswordState_(hasPin, | 205 [[getPasswordState_(hasPin, |
| 213 prefs.settings.enable_screen_lock.value)]] | 206 prefs.settings.enable_screen_lock.value)]] |
| 214 </div> | 207 </div> |
| 215 </div> | 208 </div> |
| 216 <button class="subpage-arrow" is="paper-icon-button-light" | 209 <button class="subpage-arrow" is="paper-icon-button-light" |
| 217 aria-label="$i18n{lockScreenTitle}" | 210 aria-label="$i18n{lockScreenTitle}" |
| 218 aria-describedby="lockScrenSecondary"></button> | 211 aria-describedby="lockScrenSecondary"></button> |
| 219 </div> | 212 </div> |
| 220 </template> | 213 </template> |
| 221 | |
| 222 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | |
| 223 <div id="easy-unlock" class="settings-box two-line"> | |
| 224 <div class="start"> | |
| 225 <div>$i18n{easyUnlockSectionTitle}</div> | |
| 226 <div class="secondary"> | |
| 227 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 228 $i18n{easyUnlockSetupIntro} | |
| 229 </template> | |
| 230 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 231 $i18n{easyUnlockDescription} | |
| 232 </template> | |
| 233 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | |
| 234 $i18n{learnMore} | |
| 235 </a> | |
| 236 <!-- TODO(dbeam): this should be 1 dom-if with a method instead | |
| 237 of 2 nested dom-ifs. --> | |
| 238 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 239 <template is="dom-if" | |
| 240 if="[[easyUnlockProximityDetectionAllowed_]]"> | |
| 241 <settings-toggle-button | |
| 242 pref="{{prefs.easy_unlock.proximity_required}}" | |
| 243 label="$i18n{easyUnlockRequireProximityLabel}"> | |
| 244 </settings-toggle-button> | |
| 245 </template> | |
| 246 </template> | |
| 247 </div> | |
| 248 </div> | |
| 249 <div class="secondary-action"> | |
| 250 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | |
| 251 <paper-button id="easyUnlockSetup" class="secondary-button" | |
| 252 on-tap="onEasyUnlockSetupTap_"> | |
| 253 $i18n{easyUnlockSetupButton} | |
| 254 </paper-button> | |
| 255 </template> | |
| 256 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | |
| 257 <paper-button id="easyUnlockTurnOff" class="secondary-button" | |
| 258 on-tap="onEasyUnlockTurnOffTap_"> | |
| 259 $i18n{easyUnlockTurnOffButton} | |
| 260 </paper-button> | |
| 261 </template> | |
| 262 </div> | |
| 263 </div> | |
| 264 </template> | |
| 265 </if> | 214 </if> |
| 266 | 215 |
| 267 <div id="manage-other-people-subpage-trigger" | 216 <div id="manage-other-people-subpage-trigger" |
| 268 class="settings-box" on-tap="onManageOtherPeople_" actionable> | 217 class="settings-box" on-tap="onManageOtherPeople_" actionable> |
| 269 <div class="start">$i18n{manageOtherPeople}</div> | 218 <div class="start">$i18n{manageOtherPeople}</div> |
| 270 <button class="subpage-arrow" is="paper-icon-button-light" | 219 <button class="subpage-arrow" is="paper-icon-button-light" |
| 271 aria-label="$i18n{manageOtherPeople}"></button> | 220 aria-label="$i18n{manageOtherPeople}"></button> |
| 272 </div> | 221 </div> |
| 273 | 222 |
| 274 <if expr="not chromeos"> | 223 <if expr="not chromeos"> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 </if> | 337 </if> |
| 389 </dialog> | 338 </dialog> |
| 390 </template> | 339 </template> |
| 391 | 340 |
| 392 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> | 341 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> |
| 393 <settings-import-data-dialog prefs="{{prefs}}" | 342 <settings-import-data-dialog prefs="{{prefs}}" |
| 394 on-close="onImportDataDialogClosed_"> | 343 on-close="onImportDataDialogClosed_"> |
| 395 </settings-import-data-dialog> | 344 </settings-import-data-dialog> |
| 396 </template> | 345 </template> |
| 397 | 346 |
| 398 <if expr="chromeos"> | |
| 399 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | |
| 400 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | |
| 401 on-close="onEasyUnlockTurnOffDialogClose_"> | |
| 402 </easy-unlock-turn-off-dialog> | |
| 403 </template> | |
| 404 </if> | |
| 405 </template> | 347 </template> |
| 406 <script src="people_page.js"></script> | 348 <script src="people_page.js"></script> |
| 407 </dom-module> | 349 </dom-module> |
| OLD | NEW |