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/i18n_behavior.html"> | |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <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"> | 5 <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"> | 6 <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"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
8 <link rel="import" href="/controls/settings_checkbox.html"> | 9 <link rel="import" href="/controls/settings_checkbox.html"> |
9 <link rel="import" href="/people_page/sync_page.html"> | 10 <link rel="import" href="/people_page/sync_page.html"> |
10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 11 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
11 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 12 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
12 <link rel="import" href="/route.html"> | 13 <link rel="import" href="/route.html"> |
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 14 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
14 <link rel="import" href="/settings_page/settings_subpage.html"> | 15 <link rel="import" href="/settings_page/settings_subpage.html"> |
15 <link rel="import" href="/settings_shared_css.html"> | 16 <link rel="import" href="/settings_shared_css.html"> |
16 | 17 |
17 <if expr="chromeos"> | 18 <if expr="chromeos"> |
18 <link rel="import" href="/people_page/change_picture.html"> | 19 <link rel="import" href="/people_page/change_picture.html"> |
19 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> | 20 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> |
20 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> | 21 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> |
21 <link rel="import" href="/people_page/quick_unlock_authenticate.html"> | 22 <link rel="import" href="/people_page/lock_screen.html"> |
22 <link rel="import" href="/people_page/quick_unlock_choose_method.html"> | 23 <link rel="import" href="/people_page/lock_state_behavior.html"> |
23 <link rel="import" href="/people_page/quick_unlock_setup_pin.html"> | |
24 <link rel="import" href="/people_page/users_page.html"> | 24 <link rel="import" href="/people_page/users_page.html"> |
25 </if> | 25 </if> |
26 <if expr="not chromeos"> | 26 <if expr="not chromeos"> |
27 <link rel="import" href="/people_page/manage_profile.html"> | 27 <link rel="import" href="/people_page/manage_profile.html"> |
28 </if> | 28 </if> |
29 | 29 |
30 <dom-module id="settings-people-page"> | 30 <dom-module id="settings-people-page"> |
31 <template> | 31 <template> |
32 <style include="settings-shared"> | 32 <style include="settings-shared"> |
33 setting-box.middle { | 33 setting-box.middle { |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
154 <div class="icon-container"> | 154 <div class="icon-container"> |
155 <div id="googleg-logo"></div> | 155 <div id="googleg-logo"></div> |
156 </div> | 156 </div> |
157 <div class="middle"> | 157 <div class="middle"> |
158 <div>$i18n{personalizeGoogleServicesTitle}</div> | 158 <div>$i18n{personalizeGoogleServicesTitle}</div> |
159 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 159 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
160 </div> | 160 </div> |
161 </div> | 161 </div> |
162 | 162 |
163 <if expr="chromeos"> | 163 <if expr="chromeos"> |
164 <div class="settings-box single-column"> | 164 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
165 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 165 <div class="settings-box single-column"> |
166 label="$i18n{enableScreenlock}"> | 166 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
167 </settings-checkbox> | 167 label="$i18n{enableScreenlock}"> |
168 </div> | 168 </settings-checkbox> |
169 | |
170 <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is | |
171 disabled. --> | |
172 <template is="dom-if" if=[[quickUnlockEnabled_]]> | |
173 <div class="settings-box"> | |
174 <paper-button on-tap="onQuickUnlockTap_" class="primary-button"> | |
175 $i18n{quickUnlockTitle} | |
176 </paper-button> | |
177 </div> | 169 </div> |
178 </template> | 170 </template> |
179 | 171 |
172 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | |
173 <div class="settings-box two-line" on-tap="onLockTap_" actionable> | |
tommycli
2016/08/05 17:46:19
Maybe rename to onConfigureLockScreenTap_?
jdufault
2016/08/05 20:59:52
Done.
| |
174 <div class="middle"> | |
175 <div>$i18n{lockScreenTitle}</div> | |
176 <div class="secondary"> | |
177 [[getPasswordState_(hasPin, | |
178 prefs.settings.enable_screen_lock.value)]] | |
179 </div> | |
180 </div> | |
181 </div> | |
182 </template> | |
183 | |
180 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 184 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
181 <div class="settings-box"> | 185 <div class="settings-box"> |
182 <div class="middle"> | 186 <div class="middle"> |
183 <div>$i18n{easyUnlockSectionTitle}</div> | 187 <div>$i18n{easyUnlockSectionTitle}</div> |
184 <div class="secondary"> | 188 <div class="secondary"> |
185 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 189 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
186 $i18n{easyUnlockSetupIntro} | 190 $i18n{easyUnlockSetupIntro} |
187 </template> | 191 </template> |
188 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 192 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
189 $i18n{easyUnlockDescription} | 193 $i18n{easyUnlockDescription} |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
235 </div> | 239 </div> |
236 </template> | 240 </template> |
237 </neon-animatable> | 241 </neon-animatable> |
238 <template is="dom-if" name="sync"> | 242 <template is="dom-if" name="sync"> |
239 <settings-subpage page-title="$i18n{syncPageTitle}"> | 243 <settings-subpage page-title="$i18n{syncPageTitle}"> |
240 <settings-sync-page current-route="[[currentRoute]]"> | 244 <settings-sync-page current-route="[[currentRoute]]"> |
241 </settings-sync-page> | 245 </settings-sync-page> |
242 </settings-subpage> | 246 </settings-subpage> |
243 </template> | 247 </template> |
244 <if expr="chromeos"> | 248 <if expr="chromeos"> |
245 <template is="dom-if" name="quick-unlock-authenticate"> | 249 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
246 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 250 <template is="dom-if" name="lockScreen"> |
247 <settings-quick-unlock-authenticate | 251 <settings-subpage page-title="$i18n{lockScreenTitle}"> |
248 set-modes="{{quickUnlockSetModes}}" | 252 <settings-lock-screen |
249 current-route="{{currentRoute}}" | 253 prefs="{{prefs}}" |
250 profile-name="[[profileName_]]"> | 254 current-route="{{currentRoute}}"> |
251 </settings-quick-unlock-authenticate> | 255 </settings-lock-screen> |
252 </settings-subpage> | 256 </settings-subpage> |
253 </template> | 257 </template> |
254 <template is="dom-if" name="quick-unlock-choose-method"> | |
255 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | |
256 <settings-quick-unlock-choose-method | |
257 set-modes="[[quickUnlockSetModes]]" | |
258 current-route="{{currentRoute}}" | |
259 prefs="{{prefs}}"> | |
260 </settings-quick-unlock-choose-method> | |
261 </settings-subpage> | |
262 </template> | |
263 <template is="dom-if" name="quick-unlock-setup-pin"> | |
264 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | |
265 <settings-quick-unlock-setup-pin | |
266 set-modes="[[quickUnlockSetModes]]" | |
267 current-route="{{currentRoute}}"> | |
268 </settings-quick-unlock-setup-pin> | |
269 </settings-subpage> | |
270 </template> | 258 </template> |
271 <template is="dom-if" name="users"> | 259 <template is="dom-if" name="users"> |
272 <settings-subpage page-title="$i18n{usersPageTitle}"> | 260 <settings-subpage page-title="$i18n{usersPageTitle}"> |
273 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 261 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
274 </settings-subpage> | 262 </settings-subpage> |
275 </template> | 263 </template> |
276 <template is="dom-if" name="changePicture"> | 264 <template is="dom-if" name="changePicture"> |
277 <settings-subpage page-title="$i18n{changePictureTitle}"> | 265 <settings-subpage page-title="$i18n{changePictureTitle}"> |
278 <settings-change-picture></settings-change-picture> | 266 <settings-change-picture></settings-change-picture> |
279 </settings-subpage> | 267 </settings-subpage> |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
318 | 306 |
319 <if expr="chromeos"> | 307 <if expr="chromeos"> |
320 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 308 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
321 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 309 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
322 </easy-unlock-turn-off-dialog> | 310 </easy-unlock-turn-off-dialog> |
323 </template> | 311 </template> |
324 </if> | 312 </if> |
325 </template> | 313 </template> |
326 <script src="people_page.js"></script> | 314 <script src="people_page.js"></script> |
327 </dom-module> | 315 </dom-module> |
OLD | NEW |