| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.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/neon-animation/neon-ani
matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/people_page/sync_page.html"> | 9 <link rel="import" href="/people_page/sync_page.html"> |
| 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 13 <link rel="import" href="/settings_page/settings_subpage.html"> | 13 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 14 <link rel="import" href="/settings_shared_css.html"> | 14 <link rel="import" href="/settings_shared_css.html"> |
| 15 | 15 |
| 16 <if expr="chromeos"> | 16 <if expr="chromeos"> |
| 17 <link rel="import" href="/people_page/change_picture.html"> | 17 <link rel="import" href="/people_page/change_picture.html"> |
| 18 <link rel="import" href="/people_page/pin_keyboard.html"> | |
| 19 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> | 18 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> |
| 20 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> | 19 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> |
| 20 <link rel="import" href="/people_page/quick_unlock_authenticate.html"> |
| 21 <link rel="import" href="/people_page/users_page.html"> | 21 <link rel="import" href="/people_page/users_page.html"> |
| 22 </if> | 22 </if> |
| 23 <if expr="not chromeos"> | 23 <if expr="not chromeos"> |
| 24 <link rel="import" href="/people_page/manage_profile.html"> | 24 <link rel="import" href="/people_page/manage_profile.html"> |
| 25 </if> | 25 </if> |
| 26 | 26 |
| 27 <dom-module id="settings-people-page"> | 27 <dom-module id="settings-people-page"> |
| 28 <template> | 28 <template> |
| 29 <style include="settings-shared"> | 29 <style include="settings-shared"> |
| 30 setting-box.middle { | 30 setting-box.middle { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 <div class="icon-container"> | 149 <div class="icon-container"> |
| 150 <div id="googleg-logo"></div> | 150 <div id="googleg-logo"></div> |
| 151 </div> | 151 </div> |
| 152 <div class="middle"> | 152 <div class="middle"> |
| 153 <div>$i18n{personalizeGoogleServicesTitle}</div> | 153 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 154 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 154 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 155 </div> | 155 </div> |
| 156 </div> | 156 </div> |
| 157 | 157 |
| 158 <if expr="chromeos"> | 158 <if expr="chromeos"> |
| 159 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock | |
| 160 settings. --> | |
| 161 <template is="dom-if" if=[[pinUnlockAllowed_]]> | |
| 162 <div class="settings-box"> | |
| 163 <!-- TODO(jdufault): i18n --> | |
| 164 <p>Quick Unlock PIN</p> | |
| 165 <pin-keyboard></pin-keyboard> | |
| 166 </div> | |
| 167 </template> | |
| 168 | |
| 169 <div class="settings-box"> | 159 <div class="settings-box"> |
| 170 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 160 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 171 label="$i18n{enableScreenlock}"> | 161 label="$i18n{enableScreenlock}"> |
| 172 </settings-checkbox> | 162 </settings-checkbox> |
| 173 </div> | 163 </div> |
| 174 | 164 |
| 165 <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is |
| 166 disabled. --> |
| 167 <template is="dom-if" if=[[quickUnlockAllowed_]]> |
| 168 <div class="settings-box"> |
| 169 <paper-button on-tap="onQuickUnlockTap_" class="primary-button"> |
| 170 $i18n{quickUnlockTitle} |
| 171 </paper-button> |
| 172 </div> |
| 173 </template> |
| 174 |
| 175 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 175 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 176 <div class="settings-box"> | 176 <div class="settings-box"> |
| 177 <div class="middle"> | 177 <div class="middle"> |
| 178 <div>$i18n{easyUnlockSectionTitle}</div> | 178 <div>$i18n{easyUnlockSectionTitle}</div> |
| 179 <div class="secondary"> | 179 <div class="secondary"> |
| 180 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 180 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 181 $i18n{easyUnlockSetupIntro} | 181 $i18n{easyUnlockSetupIntro} |
| 182 </template> | 182 </template> |
| 183 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 183 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 184 $i18n{easyUnlockDescription} | 184 $i18n{easyUnlockDescription} |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 </div> | 230 </div> |
| 231 </template> | 231 </template> |
| 232 </neon-animatable> | 232 </neon-animatable> |
| 233 <template is="dom-if" name="sync"> | 233 <template is="dom-if" name="sync"> |
| 234 <settings-subpage page-title="$i18n{syncPageTitle}"> | 234 <settings-subpage page-title="$i18n{syncPageTitle}"> |
| 235 <settings-sync-page current-route="[[currentRoute]]"> | 235 <settings-sync-page current-route="[[currentRoute]]"> |
| 236 </settings-sync-page> | 236 </settings-sync-page> |
| 237 </settings-subpage> | 237 </settings-subpage> |
| 238 </template> | 238 </template> |
| 239 <if expr="chromeos"> | 239 <if expr="chromeos"> |
| 240 <template is="dom-if" name="quick-unlock-authenticate"> |
| 241 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 242 <settings-quick-unlock-authenticate |
| 243 account-password="{{quickUnlockAccountPassword}}" |
| 244 current-route="{{currentRoute}}" |
| 245 profile-name="[[profileName_]]"> |
| 246 </settings-quick-unlock-authenticate> |
| 247 </settings-subpage> |
| 248 </template> |
| 240 <template is="dom-if" name="users"> | 249 <template is="dom-if" name="users"> |
| 241 <settings-subpage page-title="$i18n{usersPageTitle}"> | 250 <settings-subpage page-title="$i18n{usersPageTitle}"> |
| 242 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 251 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 243 </settings-subpage> | 252 </settings-subpage> |
| 244 </template> | 253 </template> |
| 245 <template is="dom-if" name="changePicture"> | 254 <template is="dom-if" name="changePicture"> |
| 246 <settings-subpage page-title="$i18n{changePictureTitle}"> | 255 <settings-subpage page-title="$i18n{changePictureTitle}"> |
| 247 <settings-change-picture></settings-change-picture> | 256 <settings-change-picture></settings-change-picture> |
| 248 </settings-subpage> | 257 </settings-subpage> |
| 249 </template> | 258 </template> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 278 | 287 |
| 279 <if expr="chromeos"> | 288 <if expr="chromeos"> |
| 280 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 289 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 281 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 290 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 282 </easy-unlock-turn-off-dialog> | 291 </easy-unlock-turn-off-dialog> |
| 283 </template> | 292 </template> |
| 284 </if> | 293 </if> |
| 285 </template> | 294 </template> |
| 286 <script src="people_page.js"></script> | 295 <script src="people_page.js"></script> |
| 287 </dom-module> | 296 </dom-module> |
| OLD | NEW |