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