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%; /* Apply 20px line-height to paper radio button |
| 41 text to match rest of settings line-heights. */ |
35 width: 100%; | 42 width: 100%; |
36 }; | 43 }; |
37 } | 44 } |
38 | 45 |
39 paper-radio-button > .start { | 46 #pinPasswordDiv, |
40 flex: 1; | 47 #pinPasswordSecondaryActionDiv { |
| 48 margin: auto; |
41 } | 49 } |
42 </style> | 50 </style> |
43 | 51 |
44 <div> | 52 <div> |
45 <div class="list-frame"> | 53 <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" | 54 <settings-toggle-button class="start" |
75 pref="{{prefs.settings.enable_screen_lock}}" | 55 pref="{{prefs.settings.enable_screen_lock}}" |
76 label="$i18n{enableScreenlock}"> | 56 label="$i18n{enableScreenlock}"> |
77 </settings-toggle-button> | 57 </settings-toggle-button> |
78 </div> | 58 </div> |
79 | 59 |
| 60 <div id="lockOptionsDiv"> |
| 61 <div class="settings-box"> |
| 62 <h2>$i18n{lockScreenOptions}</h2> |
| 63 </div> |
| 64 <div class="list-frame"> |
| 65 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> |
| 66 <paper-radio-button name="password" class="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" class="list-item underbar"> |
| 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 <div class="separator"></div> |
| 84 <div id="pinPasswordSecondaryActionDiv" |
| 85 class="secondary-action"> |
| 86 <paper-button id="setupPinButton" class="secondary-button" |
| 87 on-tap="onConfigurePin_"> |
| 88 [[getSetupPinText_(hasPin)]] |
| 89 </paper-button> |
| 90 </div> |
| 91 </template> |
| 92 </paper-radio-button> |
| 93 </paper-radio-group> |
| 94 </div> |
| 95 </div> |
| 96 |
80 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 97 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
81 <div id="fingerprintDiv"> | 98 <div id="fingerprintDiv"> |
82 <div class="settings-box"> | 99 <div class="settings-box continuation"> |
83 <settings-toggle-button class="start" | 100 <settings-toggle-button class="start" |
84 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" | 101 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" |
85 label="$i18n{lockScreenFingerprintEnable}"> | 102 label="$i18n{lockScreenFingerprintEnable}"> |
86 </settings-toggle-button> | 103 </settings-toggle-button> |
87 </div> | 104 </div> |
88 <iron-collapse | 105 <iron-collapse |
89 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> | 106 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> |
90 <div class="settings-box continuation" on-tap="onEditFingerprints_" | 107 <div class="settings-box continuation"> |
91 actionable> | |
92 <div class="start"> | 108 <div class="start"> |
93 $i18n{lockScreenEditFingerprints} | 109 $i18n{lockScreenEditFingerprints} |
94 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> | 110 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> |
95 [[getDescriptionText_(numFingerprints_)]] | 111 [[getDescriptionText_(numFingerprints_)]] |
96 </div> | 112 </div> |
97 </div> | 113 </div> |
98 <button class="subpage-arrow" is="paper-icon-button-light" | 114 <div class="separator"></div> |
99 aria-label="$i18n{lockScreenEditFingerprints}" | 115 <div class="secondary-action"> |
100 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> |
101 </div> | 123 </div> |
102 </iron-collapse> | 124 </iron-collapse> |
103 </div> | 125 </div> |
104 </template> | 126 </template> |
105 | 127 |
106 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 128 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
107 <div id="easyUnlock" class="settings-box two-line"> | 129 <div id="easyUnlock" class="settings-box two-line continuation"> |
108 <div class="start"> | 130 <div class="start"> |
109 <div>$i18n{easyUnlockSectionTitle}</div> | 131 <div>$i18n{easyUnlockSectionTitle}</div> |
110 <div class="secondary"> | 132 <div class="secondary"> |
111 [[getEasyUnlockDescription_(easyUnlockEnabled_, | 133 [[getEasyUnlockDescription_(easyUnlockEnabled_, |
112 '$i18nPolymer{easyUnlockDescription}', | 134 '$i18nPolymer{easyUnlockDescription}', |
113 '$i18nPolymer{easyUnlockSetupIntro}')]] | 135 '$i18nPolymer{easyUnlockSetupIntro}')]] |
114 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | 136 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
115 $i18n{learnMore} | 137 $i18n{learnMore} |
116 </a> | 138 </a> |
117 <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... |
150 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 172 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
151 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 173 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
152 on-close="onEasyUnlockTurnOffDialogClose_"> | 174 on-close="onEasyUnlockTurnOffDialogClose_"> |
153 </easy-unlock-turn-off-dialog> | 175 </easy-unlock-turn-off-dialog> |
154 </template> | 176 </template> |
155 </div> | 177 </div> |
156 </template> | 178 </template> |
157 | 179 |
158 <script src="lock_screen.js"></script> | 180 <script src="lock_screen.js"></script> |
159 </dom-module> | 181 </dom-module> |
OLD | NEW |