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 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 53 <div id="screenLockDiv" class="settings-box first"> |
46 <div class="list-frame"> | |
47 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | |
48 <paper-radio-button name="password"> | |
49 <div class="start"> | |
50 $i18n{lockScreenPasswordOnly} | |
51 <div class="secondary"> | |
52 $i18n{lockScreenHighSecurity} | |
53 </div> | |
54 </div> | |
55 </paper-radio-button> | |
56 <paper-radio-button name="pin+password"> | |
57 <div class="start"> | |
58 $i18n{lockScreenPinOrPassword} | |
59 <div class="secondary"> | |
60 $i18n{lockScreenMediumSecurity} | |
61 </div> | |
62 </div> | |
63 <template is="dom-if" | |
64 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | |
65 <paper-button id="setupPinButton" class="secondary-button" | |
66 on-tap="onConfigurePin_"> | |
67 [[getSetupPinText_(hasPin)]] | |
68 </paper-button> | |
69 </template> | |
70 </paper-radio-button> | |
71 </paper-radio-group> | |
72 </div> | |
73 </template> | |
74 | |
75 <div id="screenLockDiv" class="settings-box"> | |
76 <settings-toggle-button class="start" | 54 <settings-toggle-button class="start" |
77 pref="{{prefs.settings.enable_screen_lock}}" | 55 pref="{{prefs.settings.enable_screen_lock}}" |
78 label="$i18n{enableScreenlock}"> | 56 label="$i18n{enableScreenlock}"> |
79 </settings-toggle-button> | 57 </settings-toggle-button> |
80 </div> | 58 </div> |
81 | 59 |
| 60 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 61 <div id="lockOptionsDiv"> |
| 62 <div class="settings-box"> |
| 63 <h2>$i18n{lockScreenOptions}</h2> |
| 64 </div> |
| 65 <div class="list-frame"> |
| 66 <paper-radio-group id="unlockType" |
| 67 selected="{{selectedUnlockType}}"> |
| 68 <paper-radio-button name="password" class="list-item underbar"> |
| 69 <div class="start"> |
| 70 $i18n{lockScreenPasswordOnly} |
| 71 <div class="secondary"> |
| 72 $i18n{lockScreenHighSecurity} |
| 73 </div> |
| 74 </div> |
| 75 </paper-radio-button> |
| 76 <paper-radio-button name="pin+password" |
| 77 class="list-item underbar"> |
| 78 <div id="pinPasswordDiv" class="start"> |
| 79 $i18n{lockScreenPinOrPassword} |
| 80 <div class="secondary"> |
| 81 $i18n{lockScreenMediumSecurity} |
| 82 </div> |
| 83 </div> |
| 84 <template is="dom-if" |
| 85 if="[[showConfigurePinButton_(selectedUnlockType)]]"> |
| 86 <div class="separator"></div> |
| 87 <div id="pinPasswordSecondaryActionDiv" |
| 88 class="secondary-action"> |
| 89 <paper-button id="setupPinButton" class="secondary-button" |
| 90 on-tap="onConfigurePin_"> |
| 91 [[getSetupPinText_(hasPin)]] |
| 92 </paper-button> |
| 93 </div> |
| 94 </template> |
| 95 </paper-radio-button> |
| 96 </paper-radio-group> |
| 97 </div> |
| 98 </div> |
| 99 </template> |
| 100 |
82 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 101 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
83 <div id="fingerprintDiv"> | 102 <div id="fingerprintDiv"> |
84 <div class="settings-box"> | 103 <div class="settings-box continuation"> |
85 <settings-toggle-button class="start" | 104 <settings-toggle-button class="start" |
86 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" | 105 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" |
87 label="$i18n{lockScreenFingerprintEnable}"> | 106 label="$i18n{lockScreenFingerprintEnable}"> |
88 </settings-toggle-button> | 107 </settings-toggle-button> |
89 </div> | 108 </div> |
90 <iron-collapse | 109 <iron-collapse |
91 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> | 110 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> |
92 <div class="settings-box continuation" on-tap="onEditFingerprints_" | 111 <div class="settings-box continuation"> |
93 actionable> | |
94 <div class="start"> | 112 <div class="start"> |
95 $i18n{lockScreenEditFingerprints} | 113 $i18n{lockScreenEditFingerprints} |
96 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> | 114 <div class="secondary" id="lockScreenEditFingerprintsSecondary"> |
97 [[getDescriptionText_(numFingerprints_)]] | 115 [[getDescriptionText_(numFingerprints_)]] |
98 </div> | 116 </div> |
99 </div> | 117 </div> |
100 <button class="subpage-arrow" is="paper-icon-button-light" | 118 <div class="separator"></div> |
101 aria-label="$i18n{lockScreenEditFingerprints}" | 119 <div class="secondary-action"> |
102 aria-describedby="lockScreenEditFingerprintsSecondary"></butto
n> | 120 <paper-button class="secondary-button" |
| 121 on-tap="onEditFingerprints_" |
| 122 aria-label="$i18n{lockScreenEditFingerprints}" |
| 123 aria-descibedby="lockScreenEditFingerprintsSecondary"> |
| 124 $i18n{lockScreenSetupFingerprintButton} |
| 125 </paper-button> |
| 126 </div> |
103 </div> | 127 </div> |
104 </iron-collapse> | 128 </iron-collapse> |
105 </div> | 129 </div> |
106 </template> | 130 </template> |
107 | 131 |
108 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 132 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
109 <div id="easyUnlock" class="settings-box two-line"> | 133 <div id="easyUnlock" class="settings-box two-line continuation"> |
110 <div class="start"> | 134 <div class="start"> |
111 <div>$i18n{easyUnlockSectionTitle}</div> | 135 <div>$i18n{easyUnlockSectionTitle}</div> |
112 <div class="secondary"> | 136 <div class="secondary"> |
113 [[getEasyUnlockDescription_(easyUnlockEnabled_, | 137 [[getEasyUnlockDescription_(easyUnlockEnabled_, |
114 '$i18nPolymer{easyUnlockDescription}', | 138 '$i18nPolymer{easyUnlockDescription}', |
115 '$i18nPolymer{easyUnlockSetupIntro}')]] | 139 '$i18nPolymer{easyUnlockSetupIntro}')]] |
116 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | 140 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
117 $i18n{learnMore} | 141 $i18n{learnMore} |
118 </a> | 142 </a> |
119 <template is="dom-if" if="[[getShowEasyUnlockToggle_( | 143 <template is="dom-if" if="[[getShowEasyUnlockToggle_( |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 176 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
153 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 177 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
154 on-close="onEasyUnlockTurnOffDialogClose_"> | 178 on-close="onEasyUnlockTurnOffDialogClose_"> |
155 </easy-unlock-turn-off-dialog> | 179 </easy-unlock-turn-off-dialog> |
156 </template> | 180 </template> |
157 </div> | 181 </div> |
158 </template> | 182 </template> |
159 | 183 |
160 <script src="lock_screen.js"></script> | 184 <script src="lock_screen.js"></script> |
161 </dom-module> | 185 </dom-module> |
OLD | NEW |