OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/html/assert.html"> | 3 <link rel="import" href="chrome://resources/html/assert.html"> |
4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
7 <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-icon-button/paper -icon-button-light.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> |
9 <link rel="import" href="../controls/settings_dropdown_menu.html"> | |
9 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
10 <link rel="import" href="easy_unlock_browser_proxy.html"> | 11 <link rel="import" href="easy_unlock_browser_proxy.html"> |
11 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 12 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
12 <link rel="import" href="fingerprint_browser_proxy.html"> | 13 <link rel="import" href="fingerprint_browser_proxy.html"> |
13 <link rel="import" href="lock_screen_constants.html"> | 14 <link rel="import" href="lock_screen_constants.html"> |
14 <link rel="import" href="lock_state_behavior.html"> | 15 <link rel="import" href="lock_state_behavior.html"> |
15 <link rel="import" href="password_prompt_dialog.html"> | 16 <link rel="import" href="password_prompt_dialog.html"> |
16 <link rel="import" href="setup_pin_dialog.html"> | 17 <link rel="import" href="setup_pin_dialog.html"> |
17 <link rel="import" href="../i18n_setup.html"> | 18 <link rel="import" href="../i18n_setup.html"> |
18 <link rel="import" href="../prefs/prefs_behavior.html"> | 19 <link rel="import" href="../prefs/prefs_behavior.html"> |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
65 </div> | 66 </div> |
66 <div class="list-frame"> | 67 <div class="list-frame"> |
67 <paper-radio-group id="unlockType" | 68 <paper-radio-group id="unlockType" |
68 selected="{{selectedUnlockType}}"> | 69 selected="{{selectedUnlockType}}"> |
69 <paper-radio-button name="password" class="list-item underbar"> | 70 <paper-radio-button name="password" class="list-item underbar"> |
70 <div class="start"> | 71 <div class="start"> |
71 $i18n{lockScreenPasswordOnly} | 72 $i18n{lockScreenPasswordOnly} |
72 </div> | 73 </div> |
73 </paper-radio-button> | 74 </paper-radio-button> |
74 <paper-radio-button name="pin+password" | 75 <paper-radio-button name="pin+password" |
75 class="list-item underbar"> | 76 class="list-item underbar"> |
stevenjb
2017/07/17 16:55:08
'underbar' should be removed here (see next commen
sacomoto
2017/07/20 19:50:15
Done.
| |
76 <div id="pinPasswordDiv" class="start"> | 77 <div id="pinPasswordDiv" class="start"> |
77 $i18n{lockScreenPinOrPassword} | 78 $i18n{lockScreenPinOrPassword} |
78 </div> | 79 </div> |
79 <template is="dom-if" | 80 <template is="dom-if" |
80 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | 81 if="[[showConfigurePinButton_(selectedUnlockType)]]"> |
81 <div class="separator"></div> | 82 <div class="separator"></div> |
82 <div id="pinPasswordSecondaryActionDiv" | 83 <div id="pinPasswordSecondaryActionDiv" |
83 class="secondary-action"> | 84 class="secondary-action"> |
84 <paper-button id="setupPinButton" class="secondary-button" | 85 <paper-button id="setupPinButton" class="secondary-button" |
85 on-tap="onConfigurePin_"> | 86 on-tap="onConfigurePin_"> |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
118 aria-descibedby="lockScreenEditFingerprintsSecondary"> | 119 aria-descibedby="lockScreenEditFingerprintsSecondary"> |
119 $i18n{lockScreenSetupFingerprintButton} | 120 $i18n{lockScreenSetupFingerprintButton} |
120 </paper-button> | 121 </paper-button> |
121 </div> | 122 </div> |
122 </div> | 123 </div> |
123 </iron-collapse> | 124 </iron-collapse> |
124 </div> | 125 </div> |
125 </template> | 126 </template> |
126 | 127 |
127 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 128 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
128 <div id="easyUnlock" class="settings-box two-line continuation"> | 129 <div id="easyUnlock" class="settings-box two-line continuation"> |
stevenjb
2017/07/17 16:55:08
I also noticed that this really shouldn't be 'cont
sacomoto
2017/07/20 19:50:15
Done.
| |
129 <div class="start"> | 130 <div class="start"> |
130 <div>$i18n{easyUnlockSectionTitle}</div> | 131 <div>$i18n{easyUnlockSectionTitle}</div> |
131 <div class="secondary"> | 132 <div class="secondary"> |
132 [[getEasyUnlockDescription_(easyUnlockEnabled_, | 133 [[getEasyUnlockDescription_(easyUnlockEnabled_, |
133 '$i18nPolymer{easyUnlockDescription}', | 134 '$i18nPolymer{easyUnlockDescription}', |
134 '$i18nPolymer{easyUnlockSetupIntro}')]] | 135 '$i18nPolymer{easyUnlockSetupIntro}')]] |
135 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> | 136 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> |
136 $i18n{learnMore} | 137 $i18n{learnMore} |
137 </a> | 138 </a> |
138 <template is="dom-if" if="[[getShowEasyUnlockToggle_( | 139 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
139 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]"> | 140 <div class="setting-box"> |
stevenjb
2017/07/17 16:43:36
Instead of having a settings-box inside a settings
sacomoto
2017/07/20 19:50:15
Done.
| |
140 <settings-toggle-button | 141 <div class="start"> |
141 pref="{{prefs.easy_unlock.proximity_required}}" | 142 $i18n{easyUnlockProximityThresholdLabel} |
142 label="$i18n{easyUnlockRequireProximityLabel}"> | 143 <settings-dropdown-menu |
143 </settings-toggle-button> | 144 pref="{{prefs.easy_unlock.proximity_threshold}}" |
145 menu-options="[[easyUnlockProximityThresholdMapping_]]"> | |
146 </settings-dropdown-menu> | |
stevenjb
2017/07/17 16:43:37
The dropdown menu should be at the same level as t
sacomoto
2017/07/20 19:50:15
Done.
| |
147 </div> | |
148 </div> | |
144 </template> | 149 </template> |
145 </div> | 150 </div> |
146 </div> | 151 </div> |
147 <div class="separator"></div> | 152 <div class="separator"></div> |
148 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 153 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
149 <paper-button id="easyUnlockSetup" class="secondary-button" | 154 <paper-button id="easyUnlockSetup" class="secondary-button" |
150 on-tap="onEasyUnlockSetupTap_"> | 155 on-tap="onEasyUnlockSetupTap_"> |
151 $i18n{easyUnlockSetupButton} | 156 $i18n{easyUnlockSetupButton} |
152 </paper-button> | 157 </paper-button> |
153 </template> | 158 </template> |
154 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 159 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
155 <paper-button id="easyUnlockTurnOff" class="secondary-button" | 160 <paper-button id="easyUnlockTurnOff" class="secondary-button" |
(...skipping 19 matching lines...) Expand all Loading... | |
175 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]" restamp> | 180 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]" restamp> |
176 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 181 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
177 on-close="onEasyUnlockTurnOffDialogClose_"> | 182 on-close="onEasyUnlockTurnOffDialogClose_"> |
178 </easy-unlock-turn-off-dialog> | 183 </easy-unlock-turn-off-dialog> |
179 </template> | 184 </template> |
180 </div> | 185 </div> |
181 </template> | 186 </template> |
182 | 187 |
183 <script src="lock_screen.js"></script> | 188 <script src="lock_screen.js"></script> |
184 </dom-module> | 189 </dom-module> |
OLD | NEW |