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 action-link"> |
23 #easyUnlock .start { | 23 #easyUnlock .start, |
| 24 #pinPasswordDiv.start { |
24 /* When the easy unlock toggle is shown, the easy unlock section's | 25 /* 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 | 26 * content becomes squashed to the top and bottom edges. Use padding to |
26 * ensure the easy unlock content looks correct. */ | 27 * ensure the easy unlock content looks correct. This also applies to |
| 28 * the pin+password content section when the setup pin button is shown. |
| 29 */ |
27 padding: 11px 0; | 30 padding: 11px 0; |
28 } | 31 } |
29 | 32 |
| 33 #lockOptionsDiv { |
| 34 display: block; |
| 35 } |
| 36 |
30 paper-radio-button { | 37 paper-radio-button { |
31 --paper-radio-button-label: { | 38 --paper-radio-button-label: { |
32 display: flex; | 39 display: flex; |
33 width: 100%; | 40 width: 100%; |
34 }; | 41 }; |
35 } | 42 } |
36 | 43 |
37 paper-radio-button > .start { | 44 paper-radio-button > .start { |
38 flex: 1; | 45 flex: 1; |
39 } | 46 } |
| 47 |
| 48 #setupPinButton { |
| 49 margin: auto; |
| 50 } |
40 </style> | 51 </style> |
41 | 52 |
42 <div> | 53 <div> |
43 <div class="list-frame"> | 54 <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" | 55 <settings-toggle-button class="start" |
73 pref="{{prefs.settings.enable_screen_lock}}" | 56 pref="{{prefs.settings.enable_screen_lock}}" |
74 label="$i18n{enableScreenlock}"> | 57 label="$i18n{enableScreenlock}"> |
75 </settings-toggle-button> | 58 </settings-toggle-button> |
76 </div> | 59 </div> |
77 | 60 |
| 61 <div id="lockOptionsDiv" class="settings-box"> |
| 62 <h2> $i18n{lockScreenOptions} </h2> |
| 63 <div class="list-frame"> |
| 64 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> |
| 65 <paper-radio-button name="password" class="settings-box first"> |
| 66 <div class="start"> |
| 67 $i18n{lockScreenPasswordOnly} |
| 68 <div class="secondary"> |
| 69 $i18n{lockScreenHighSecurity} |
| 70 </div> |
| 71 </div> |
| 72 </paper-radio-button> |
| 73 <paper-radio-button name="pin+password" |
| 74 class="settings-box two-line"> |
| 75 <div id="pinPasswordDiv" class="start"> |
| 76 $i18n{lockScreenPinOrPassword} |
| 77 <div class="secondary"> |
| 78 $i18n{lockScreenMediumSecurity} |
| 79 </div> |
| 80 </div> |
| 81 <template is="dom-if" |
| 82 if="[[showConfigurePinButton_(selectedUnlockType)]]"> |
| 83 <paper-button id="setupPinButton" class="secondary-button" |
| 84 on-tap="onConfigurePin_"> |
| 85 [[getSetupPinText_(hasPin)]] |
| 86 </paper-button> |
| 87 </template> |
| 88 </paper-radio-button> |
| 89 </paper-radio-group> |
| 90 </div> |
| 91 </div> |
| 92 |
78 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 93 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
79 <div id="fingerprintDiv"> | 94 <div id="fingerprintDiv"> |
80 <div class="settings-box"> | 95 <div class="settings-box"> |
81 <settings-toggle-button class="start" | 96 <settings-toggle-button class="start" |
82 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" | 97 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" |
83 label="$i18n{lockScreenFingerprintEnable}"> | 98 label="$i18n{lockScreenFingerprintEnable}"> |
84 </settings-toggle-button> | 99 </settings-toggle-button> |
85 </div> | 100 </div> |
86 <iron-collapse | 101 <iron-collapse |
87 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> | 102 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> |
88 <div class="settings-box continuation" on-tap="onEditFingerprints_" | 103 <div class="settings-box continuation"> |
89 actionable> | |
90 <div class="start"> | 104 <div class="start"> |
91 $i18n{lockScreenEditFingerprints} | 105 $i18n{lockScreenEditFingerprints} |
92 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> | 106 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> |
93 [[getDescriptionText_(numFingerprints_)]] | 107 [[getDescriptionText_(numFingerprints_)]] |
94 </div> | 108 </div> |
95 </div> | 109 </div> |
96 <button class="subpage-arrow" is="paper-icon-button-light" | 110 <paper-button class="secondary-button" |
| 111 on-tap="onEditFingerprints_" |
97 aria-label="$i18n{lockScreenEditFingerprints}" | 112 aria-label="$i18n{lockScreenEditFingerprints}" |
98 aria-describedby="lockScreenEditFingerprintsSecondary"></butto
n> | 113 aria-descibedby="lockScreenEditFingerprintsSecondary"> |
| 114 $i18n{lockScreenSetupFingerprintButton} |
| 115 </paper-button> |
99 </div> | 116 </div> |
100 </iron-collapse> | 117 </iron-collapse> |
101 </div> | 118 </div> |
102 </template> | 119 </template> |
103 | 120 |
104 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 121 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
105 <div id="easyUnlock" class="settings-box two-line"> | 122 <div id="easyUnlock" class="settings-box two-line"> |
106 <div class="start"> | 123 <div class="start"> |
107 <div>$i18n{easyUnlockSectionTitle}</div> | 124 <div>$i18n{easyUnlockSectionTitle}</div> |
108 <div class="secondary"> | 125 <div class="secondary"> |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 166 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
150 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 167 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
151 on-close="onEasyUnlockTurnOffDialogClose_"> | 168 on-close="onEasyUnlockTurnOffDialogClose_"> |
152 </easy-unlock-turn-off-dialog> | 169 </easy-unlock-turn-off-dialog> |
153 </template> | 170 </template> |
154 </div> | 171 </div> |
155 </template> | 172 </template> |
156 | 173 |
157 <script src="lock_screen.js"></script> | 174 <script src="lock_screen.js"></script> |
158 </dom-module> | 175 </dom-module> |
OLD | NEW |