Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: chrome/browser/resources/settings/people_page/people_page.html

Issue 1933913002: Add a very basic PIN UI implementation that is shared between lock and settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Address comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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="chrome://md-settings/controls/settings_checkbox.html"> 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
8 <link rel="import" href="chrome://md-settings/i18n_setup.html"> 8 <link rel="import" href="chrome://md-settings/i18n_setup.html">
9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> 9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html">
10 <link rel="import" href="chrome://md-settings/people_page/profile_info_browser_p roxy.html"> 10 <link rel="import" href="chrome://md-settings/people_page/profile_info_browser_p roxy.html">
11 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm l"> 11 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm l">
12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> 13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l">
14 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 14 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
15 15
16 <if expr="chromeos"> 16 <if expr="chromeos">
17 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> 17 <link rel="import" href="chrome://md-settings/people_page/change_picture.html">
18 <link rel="import" href="chrome://md-settings/people_page/pin.html">
18 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html"> 19 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html">
19 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html"> 20 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html">
20 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> 21 <link rel="import" href="chrome://md-settings/people_page/users_page.html">
21 </if> 22 </if>
22 <if expr="not chromeos"> 23 <if expr="not chromeos">
23 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> 24 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
24 </if> 25 </if>
25 26
26 <dom-module id="settings-people-page"> 27 <dom-module id="settings-people-page">
27 <template> 28 <template>
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 <template is="dom-if" 95 <template is="dom-if"
95 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 96 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
96 <div class="settings-box"> 97 <div class="settings-box">
97 <paper-button on-tap="onSyncTap_" class="primary-button"> 98 <paper-button on-tap="onSyncTap_" class="primary-button">
98 $i18n{syncPageTitle} 99 $i18n{syncPageTitle}
99 </paper-button> 100 </paper-button>
100 </div> 101 </div>
101 </template> 102 </template>
102 103
103 <if expr="chromeos"> 104 <if expr="chromeos">
105 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock
106 settings. -->
107 <template is="dom-if" if=[[pinUnlockAllowed_]]>
108 <div class="settings-box">
109 <!-- TODO(jdufault): i18n -->
110 <p>Quick Unlock PIN</p>
111 <pin-keyboard></pin-keyboard>
112 </div>
113 </template>
114
104 <div class="settings-box"> 115 <div class="settings-box">
105 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 116 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
106 i18n-values="label:enableScreenlock"> 117 i18n-values="label:enableScreenlock">
107 </settings-checkbox> 118 </settings-checkbox>
108 </div> 119 </div>
109 120
110 <template is="dom-if" if="[[easyUnlockAllowed_]]"> 121 <template is="dom-if" if="[[easyUnlockAllowed_]]">
111 <div class="settings-box"> 122 <div class="settings-box">
112 <div class="middle"> 123 <div class="middle">
113 <div>$i18n{easyUnlockSectionTitle}</div> 124 <div>$i18n{easyUnlockSectionTitle}</div>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 215
205 <if expr="chromeos"> 216 <if expr="chromeos">
206 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 217 <template is="dom-if" if="[[easyUnlockEnabled_]]">
207 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 218 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
208 </easy-unlock-turn-off-dialog> 219 </easy-unlock-turn-off-dialog>
209 </template> 220 </template>
210 </if> 221 </if>
211 </template> 222 </template>
212 <script src="people_page.js"></script> 223 <script src="people_page.js"></script>
213 </dom-module> 224 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698