Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1606)

Side by Side Diff: chrome/browser/resources/settings/people_page/lock_screen.html

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try to fix browser tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="/people_page/lock_state_behavior.html"> 4 <link rel="import" href="/people_page/lock_state_behavior.html">
5 <link rel="import" href="/people_page/password_prompt_dialog.html"> 5 <link rel="import" href="/people_page/password_prompt_dialog.html">
6 <link rel="import" href="/people_page/setup_pin_dialog.html"> 6 <link rel="import" href="/people_page/setup_pin_dialog.html">
7 <link rel="import" href="/prefs/prefs_behavior.html"> 7 <link rel="import" href="/prefs/prefs_behavior.html">
8 <link rel="import" href="/route.html"> 8 <link rel="import" href="/route.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 10
11 <dom-module id="settings-lock-screen"> 11 <dom-module id="settings-lock-screen">
12 <template> 12 <template>
13 <style include="settings-shared"></style> 13 <style include="settings-shared"></style>
14 <style> 14 <style>
15 .radio-indent { 15 .radio-indent {
16 margin-left: 28px; 16 margin-left: 28px;
17 } 17 }
18 18
19 .radio-indent[hidden] {
jdufault 2016/08/15 19:21:18 Are these needed? Add TODO to revert if so.
xiaoyinh(OOO Sep 11-29) 2016/08/16 17:33:43 Yes. It is very weird that in the options the hidd
20 display: none;
21 }
22 .single-column[hidden] {
23 display: none;
24 }
25
19 paper-button { 26 paper-button {
20 text-transform: none; 27 text-transform: none;
21 } 28 }
22 </style> 29 </style>
23 30
24 <div> 31 <div>
32 <!--TODO(xiaoyinh@): Revert changes to i18n text
33 once we don't need to support options -->
25 <div class="list-frame"> 34 <div class="list-frame">
26 <paper-radio-group selected="{{selectedUnlockType}}"> 35 <paper-radio-group selected="{{selectedUnlockType}}">
27 <paper-radio-button name="password"> 36 <paper-radio-button name="password">
28 $i18n{lockScreenPasswordOnly} 37 [[i18n('lockScreenPasswordOnly')]]
29 </paper-radio-button> 38 </paper-radio-button>
30 <paper-radio-button name="pin+password"> 39 <paper-radio-button name="pin+password">
31 $i18n{lockScreenPinOrPassword} 40 [[i18n('lockScreenPinOrPassword')]]
32 </paper-radio-button> 41 </paper-radio-button>
33 <div class="settings-box continuation radio-indent" 42 <div class="settings-box continuation radio-indent"
34 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> 43 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
35 <paper-button is="action-link" on-tap="onConfigurePin_"> 44 <paper-button is="action-link" on-tap="onConfigurePin_">
36 [[getSetupPinText_(hasPin)]] 45 [[getSetupPinText_(hasPin)]]
37 </paper-button> 46 </paper-button>
38 </div> 47 </div>
39 </paper-radio-group> 48 </paper-radio-group>
40 </div> 49 </div>
41 50
42 <div class="settings-box single-column"> 51 <div class="settings-box single-column"
52 hidden$="[[hideEnableScreenlock]]">
43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 53 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
44 label="$i18n{enableScreenlock}"> 54 label="$i18n{enableScreenlock}">
45 </settings-checkbox> 55 </settings-checkbox>
46 </div> 56 </div>
47 57
48 <settings-password-prompt-dialog id="passwordPrompt" 58 <settings-password-prompt-dialog id="passwordPrompt"
49 on-close="onPasswordClosed_" 59 on-close="onPasswordClosed_"
50 set-modes="{{setModes_}}"> 60 set-modes="{{setModes_}}">
51 </settings-password-prompt-dialog> 61 </settings-password-prompt-dialog>
52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 62 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
53 set-modes="[[setModes_]]"> 63 set-modes="[[setModes_]]">
54 </settings-setup-pin-dialog> 64 </settings-setup-pin-dialog>
55 </div> 65 </div>
56 </template> 66 </template>
57 67
58 <script src="lock_screen.js"></script> 68 <script src="lock_screen.js"></script>
59 </dom-module> 69 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698