OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.html"> |
2 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 2 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.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/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> |
8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
9 <link rel="import" href="easy_unlock_browser_proxy.html"> | 9 <link rel="import" href="easy_unlock_browser_proxy.html"> |
10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
11 <link rel="import" href="fingerprint_browser_proxy.html"> | 11 <link rel="import" href="fingerprint_browser_proxy.html"> |
12 <link rel="import" href="lock_screen_constants.html"> | 12 <link rel="import" href="lock_screen_constants.html"> |
13 <link rel="import" href="lock_state_behavior.html"> | 13 <link rel="import" href="lock_state_behavior.html"> |
14 <link rel="import" href="password_prompt_dialog.html"> | 14 <link rel="import" href="password_prompt_dialog.html"> |
15 <link rel="import" href="setup_pin_dialog.html"> | 15 <link rel="import" href="setup_pin_dialog.html"> |
16 <link rel="import" href="../i18n_setup.html"> | 16 <link rel="import" href="../i18n_setup.html"> |
17 <link rel="import" href="../prefs/prefs_behavior.html"> | 17 <link rel="import" href="../prefs/prefs_behavior.html"> |
18 <link rel="import" href="../prefs/prefs.html"> | 18 <link rel="import" href="../prefs/prefs.html"> |
19 <link rel="import" href="../route.html"> | 19 <link rel="import" href="../route.html"> |
20 <link rel="import" href="../settings_shared_css.html"> | 20 <link rel="import" href="../settings_shared_css.html"> |
21 | 21 |
22 <dom-module id="settings-lock-screen"> | 22 <dom-module id="settings-lock-screen"> |
23 <template> | 23 <template> |
24 <style include="settings-shared action-link"> | 24 <style include="settings-shared"> |
25 #easyUnlock .start { | 25 #easyUnlock .start { |
26 /* When the easy unlock toggle is shown, the easy unlock section's | 26 /* When the easy unlock toggle is shown, the easy unlock section's |
27 * content becomes squashed to the top and bottom edges. Use padding to | 27 * content becomes squashed to the top and bottom edges. Use padding to |
28 * ensure the easy unlock content looks correct. */ | 28 * ensure the easy unlock content looks correct. |
29 */ | |
29 padding: 11px 0; | 30 padding: 11px 0; |
30 } | 31 } |
31 | 32 |
33 #lockOptionsDiv { | |
34 display: block; | |
35 } | |
36 | |
32 paper-radio-button { | 37 paper-radio-button { |
33 --paper-radio-button-label: { | 38 --paper-radio-button-label: { |
34 display: flex; | 39 display: flex; |
40 line-height: 154%; | |
stevenjb
2017/05/08 18:12:22
Add comment on where 154% is coming from.
sammiequon
2017/05/08 19:16:49
Done.
| |
35 width: 100%; | 41 width: 100%; |
36 }; | 42 }; |
37 } | 43 } |
38 | 44 |
39 paper-radio-button > .start { | 45 #pinPasswordDiv, |
40 flex: 1; | 46 #pinPasswordSecondaryActionDiv { |
47 margin: auto; | |
41 } | 48 } |
42 </style> | 49 </style> |
43 | 50 |
44 <div> | 51 <div> |
45 <div class="list-frame"> | 52 <div id="screenLockDiv" class="settings-box first"> |
46 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | |
47 <paper-radio-button name="password"> | |
48 <div class="start"> | |
49 $i18n{lockScreenPasswordOnly} | |
50 <div class="secondary"> | |
51 $i18n{lockScreenHighSecurity} | |
52 </div> | |
53 </div> | |
54 </paper-radio-button> | |
55 <paper-radio-button name="pin+password"> | |
56 <div class="start"> | |
57 $i18n{lockScreenPinOrPassword} | |
58 <div class="secondary"> | |
59 $i18n{lockScreenMediumSecurity} | |
60 </div> | |
61 </div> | |
62 <template is="dom-if" | |
63 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | |
64 <paper-button id="setupPinButton" class="secondary-button" | |
65 on-tap="onConfigurePin_"> | |
66 [[getSetupPinText_(hasPin)]] | |
67 </paper-button> | |
68 </template> | |
69 </paper-radio-button> | |
70 </paper-radio-group> | |
71 </div> | |
72 | |
73 <div id="screenLockDiv" class="settings-box"> | |
74 <settings-toggle-button class="start" | 53 <settings-toggle-button class="start" |
75 pref="{{prefs.settings.enable_screen_lock}}" | 54 pref="{{prefs.settings.enable_screen_lock}}" |
76 label="$i18n{enableScreenlock}"> | 55 label="$i18n{enableScreenlock}"> |
77 </settings-toggle-button> | 56 </settings-toggle-button> |
78 </div> | 57 </div> |
79 | 58 |
59 <div id="lockOptionsDiv"> | |
60 <div class="settings-box"> | |
61 <h2>$i18n{lockScreenOptions}</h2> | |
62 </div> | |
63 <div class="list-frame"> | |
64 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | |
65 <paper-radio-button name="password" | |
66 class="settings-box first two-line"> | |
stevenjb
2017/05/08 18:12:22
This is weird. We use settings-box for divs, and n
sammiequon
2017/05/08 19:16:49
how about list-item underbar?
| |
67 <div class="start"> | |
68 $i18n{lockScreenPasswordOnly} | |
69 <div class="secondary"> | |
70 $i18n{lockScreenHighSecurity} | |
71 </div> | |
72 </div> | |
73 </paper-radio-button> | |
74 <paper-radio-button name="pin+password" | |
75 class="settings-box two-line"> | |
76 <div id="pinPasswordDiv" class="start"> | |
77 $i18n{lockScreenPinOrPassword} | |
78 <div class="secondary"> | |
79 $i18n{lockScreenMediumSecurity} | |
80 </div> | |
81 </div> | |
82 <template is="dom-if" | |
83 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | |
84 <div class="separator"></div> | |
85 <div id="pinPasswordSecondaryActionDiv" | |
86 class="secondary-action"> | |
87 <paper-button id="setupPinButton" class="secondary-button" | |
88 on-tap="onConfigurePin_"> | |
89 [[getSetupPinText_(hasPin)]] | |
90 </paper-button> | |
91 </div> | |
92 </template> | |
93 </paper-radio-button> | |
94 <div class="settings-box line-only"></div> | |
95 </paper-radio-group> | |
96 </div> | |
97 </div> | |
98 | |
80 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 99 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
81 <div id="fingerprintDiv"> | 100 <div id="fingerprintDiv"> |
82 <div class="settings-box"> | 101 <div class="settings-box continuation"> |
83 <settings-toggle-button class="start" | 102 <settings-toggle-button class="start" |
84 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" | 103 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" |
85 label="$i18n{lockScreenFingerprintEnable}"> | 104 label="$i18n{lockScreenFingerprintEnable}"> |
86 </settings-toggle-button> | 105 </settings-toggle-button> |
87 </div> | 106 </div> |
88 <iron-collapse | 107 <iron-collapse |
89 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> | 108 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> |
90 <div class="settings-box continuation" on-tap="onEditFingerprints_" | 109 <div class="settings-box continuation"> |
91 actionable> | |
92 <div class="start"> | 110 <div class="start"> |
93 $i18n{lockScreenEditFingerprints} | 111 $i18n{lockScreenEditFingerprints} |
94 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> | 112 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> |
95 [[getDescriptionText_(numFingerprints_)]] | 113 [[getDescriptionText_(numFingerprints_)]] |
96 </div> | 114 </div> |
97 </div> | 115 </div> |
98 <button class="subpage-arrow" is="paper-icon-button-light" | 116 <div class="separator"></div> |
99 aria-label="$i18n{lockScreenEditFingerprints}" | 117 <div class="secondary-action"> |
100 aria-describedby="lockScreenEditFingerprintsSecondary"></butto n> | 118 <paper-button class="secondary-button" |
119 on-tap="onEditFingerprints_" | |
stevenjb
2017/05/08 18:12:22
Usually we want the entire div to handle the on-ta
stevenjb
2017/05/08 18:16:56
Please ignore. Looking at the mocks (and more clos
| |
120 aria-label="$i18n{lockScreenEditFingerprints}" | |
121 aria-descibedby="lockScreenEditFingerprintsSecondary"> | |
122 $i18n{lockScreenSetupFingerprintButton} | |
123 </paper-button> | |
124 </div> | |
101 </div> | 125 </div> |
102 </iron-collapse> | 126 </iron-collapse> |
103 </div> | 127 </div> |
104 </template> | 128 </template> |
105 | 129 |
106 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 130 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
107 <div id="easyUnlock" class="settings-box two-line"> | 131 <div id="easyUnlock" class="settings-box two-line continuation"> |
108 <div class="start"> | 132 <div class="start"> |
109 <div>$i18n{easyUnlockSectionTitle}</div> | 133 <div>$i18n{easyUnlockSectionTitle}</div> |
110 <div class="secondary"> | 134 <div class="secondary"> |
111 [[getEasyUnlockDescription_(easyUnlockEnabled_, | 135 [[getEasyUnlockDescription_(easyUnlockEnabled_, |
112 '$i18nPolymer{easyUnlockDescription}', | 136 '$i18nPolymer{easyUnlockDescription}', |
113 '$i18nPolymer{easyUnlockSetupIntro}')]] | 137 '$i18nPolymer{easyUnlockSetupIntro}')]] |
114 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | 138 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
115 $i18n{learnMore} | 139 $i18n{learnMore} |
116 </a> | 140 </a> |
117 <template is="dom-if" if="[[getShowEasyUnlockToggle_( | 141 <template is="dom-if" if="[[getShowEasyUnlockToggle_( |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
150 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 174 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
151 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 175 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
152 on-close="onEasyUnlockTurnOffDialogClose_"> | 176 on-close="onEasyUnlockTurnOffDialogClose_"> |
153 </easy-unlock-turn-off-dialog> | 177 </easy-unlock-turn-off-dialog> |
154 </template> | 178 </template> |
155 </div> | 179 </div> |
156 </template> | 180 </template> |
157 | 181 |
158 <script src="lock_screen.js"></script> | 182 <script src="lock_screen.js"></script> |
159 </dom-module> | 183 </dom-module> |
OLD | NEW |