| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <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/paper-button/paper-butt
on.html"> | 4 <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-checkbox/paper-ch
eckbox.html"> | 5 <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-dialog/paper-dial
og.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> |
| 7 <link rel="import" href="/controls/settings_checkbox.html"> | 7 <link rel="import" href="/controls/settings_checkbox.html"> |
| 8 <link rel="import" href="/people_page/sync_page.html"> | 8 <link rel="import" href="/people_page/sync_page.html"> |
| 9 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 9 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| 10 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 10 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| 11 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 11 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 12 <link rel="import" href="/settings_page/settings_subpage.html"> | 12 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 13 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 14 | 14 |
| 15 <if expr="chromeos"> | 15 <if expr="chromeos"> |
| 16 <link rel="import" href="/people_page/change_picture.html"> | 16 <link rel="import" href="/people_page/change_picture.html"> |
| 17 <link rel="import" href="/people_page/pin_keyboard.html"> | |
| 18 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> | 17 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> |
| 19 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> | 18 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> |
| 19 <link rel="import" href="/people_page/quick_unlock_authenticate.html"> |
| 20 <link rel="import" href="/people_page/users_page.html"> | 20 <link rel="import" href="/people_page/users_page.html"> |
| 21 </if> | 21 </if> |
| 22 <if expr="not chromeos"> | 22 <if expr="not chromeos"> |
| 23 <link rel="import" href="/people_page/manage_profile.html"> | 23 <link rel="import" href="/people_page/manage_profile.html"> |
| 24 </if> | 24 </if> |
| 25 | 25 |
| 26 <dom-module id="settings-people-page"> | 26 <dom-module id="settings-people-page"> |
| 27 <template> | 27 <template> |
| 28 <style include="settings-shared"> | 28 <style include="settings-shared"> |
| 29 setting-box.middle { | 29 setting-box.middle { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 <div id="googleg-logo-container"> | 139 <div id="googleg-logo-container"> |
| 140 <div id="googleg-logo"></div> | 140 <div id="googleg-logo"></div> |
| 141 </div> | 141 </div> |
| 142 <div class="middle"> | 142 <div class="middle"> |
| 143 <div>$i18n{personalizeGoogleServicesTitle}</div> | 143 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 144 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 144 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 145 </div> | 145 </div> |
| 146 </div> | 146 </div> |
| 147 | 147 |
| 148 <if expr="chromeos"> | 148 <if expr="chromeos"> |
| 149 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock | |
| 150 settings. --> | |
| 151 <template is="dom-if" if=[[pinUnlockAllowed_]]> | |
| 152 <div class="settings-box"> | |
| 153 <!-- TODO(jdufault): i18n --> | |
| 154 <p>Quick Unlock PIN</p> | |
| 155 <pin-keyboard></pin-keyboard> | |
| 156 </div> | |
| 157 </template> | |
| 158 | |
| 159 <div class="settings-box"> | 149 <div class="settings-box"> |
| 160 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 150 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 161 label="$i18n{enableScreenlock}"> | 151 label="$i18n{enableScreenlock}"> |
| 162 </settings-checkbox> | 152 </settings-checkbox> |
| 163 </div> | 153 </div> |
| 164 | 154 |
| 155 <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is |
| 156 disabled. --> |
| 157 <template is="dom-if" if=[[quickUnlockAllowed_]]> |
| 158 <div class="settings-box"> |
| 159 <paper-button on-tap="onQuickUnlockTap_" class="primary-button"> |
| 160 $i18n{quickUnlockTitle} |
| 161 </paper-button> |
| 162 </div> |
| 163 </template> |
| 164 |
| 165 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 165 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 166 <div class="settings-box"> | 166 <div class="settings-box"> |
| 167 <div class="middle"> | 167 <div class="middle"> |
| 168 <div>$i18n{easyUnlockSectionTitle}</div> | 168 <div>$i18n{easyUnlockSectionTitle}</div> |
| 169 <div class="secondary"> | 169 <div class="secondary"> |
| 170 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 170 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 171 $i18n{easyUnlockSetupIntro} | 171 $i18n{easyUnlockSetupIntro} |
| 172 </template> | 172 </template> |
| 173 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 173 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 174 $i18n{easyUnlockDescription} | 174 $i18n{easyUnlockDescription} |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 </div> | 220 </div> |
| 221 </template> | 221 </template> |
| 222 </neon-animatable> | 222 </neon-animatable> |
| 223 <template is="dom-if" name="sync"> | 223 <template is="dom-if" name="sync"> |
| 224 <settings-subpage page-title="$i18n{syncPageTitle}"> | 224 <settings-subpage page-title="$i18n{syncPageTitle}"> |
| 225 <settings-sync-page current-route="[[currentRoute]]"> | 225 <settings-sync-page current-route="[[currentRoute]]"> |
| 226 </settings-sync-page> | 226 </settings-sync-page> |
| 227 </settings-subpage> | 227 </settings-subpage> |
| 228 </template> | 228 </template> |
| 229 <if expr="chromeos"> | 229 <if expr="chromeos"> |
| 230 <template is="dom-if" name="quick-unlock-authenticate"> |
| 231 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 232 <settings-quick-unlock-authenticate |
| 233 account-password="{{quickUnlockAccountPassword}}" |
| 234 current-route="{{currentRoute}}" |
| 235 profile-name="[[profileName_]]"> |
| 236 </settings-quick-unlock-authenticate> |
| 237 </settings-subpage> |
| 238 </template> |
| 230 <template is="dom-if" name="users"> | 239 <template is="dom-if" name="users"> |
| 231 <settings-subpage page-title="$i18n{usersPageTitle}"> | 240 <settings-subpage page-title="$i18n{usersPageTitle}"> |
| 232 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 241 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 233 </settings-subpage> | 242 </settings-subpage> |
| 234 </template> | 243 </template> |
| 235 <template is="dom-if" name="changePicture"> | 244 <template is="dom-if" name="changePicture"> |
| 236 <settings-subpage page-title="$i18n{changePictureTitle}"> | 245 <settings-subpage page-title="$i18n{changePictureTitle}"> |
| 237 <settings-change-picture></settings-change-picture> | 246 <settings-change-picture></settings-change-picture> |
| 238 </settings-subpage> | 247 </settings-subpage> |
| 239 </template> | 248 </template> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 268 | 277 |
| 269 <if expr="chromeos"> | 278 <if expr="chromeos"> |
| 270 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 279 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 271 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 280 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 272 </easy-unlock-turn-off-dialog> | 281 </easy-unlock-turn-off-dialog> |
| 273 </template> | 282 </template> |
| 274 </if> | 283 </if> |
| 275 </template> | 284 </template> |
| 276 <script src="people_page.js"></script> | 285 <script src="people_page.js"></script> |
| 277 </dom-module> | 286 </dom-module> |
| OLD | NEW |