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

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

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Closure. Created 3 years, 8 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/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/action_link.html"> 2 <link rel="import" href="chrome://resources/html/action_link.html">
3 <link rel="import" href="chrome://resources/html/action_link_css.html"> 3 <link rel="import" href="chrome://resources/html/action_link_css.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/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">
6 <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">
7 <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">
10 <link rel="import" href="easy_unlock_turn_off_dialog.html">
8 <link rel="import" href="fingerprint_browser_proxy.html"> 11 <link rel="import" href="fingerprint_browser_proxy.html">
9 <link rel="import" href="lock_screen_constants.html"> 12 <link rel="import" href="lock_screen_constants.html">
10 <link rel="import" href="lock_state_behavior.html"> 13 <link rel="import" href="lock_state_behavior.html">
11 <link rel="import" href="password_prompt_dialog.html"> 14 <link rel="import" href="password_prompt_dialog.html">
12 <link rel="import" href="setup_pin_dialog.html"> 15 <link rel="import" href="setup_pin_dialog.html">
13 <link rel="import" href="../i18n_setup.html"> 16 <link rel="import" href="../i18n_setup.html">
14 <link rel="import" href="../prefs/prefs_behavior.html"> 17 <link rel="import" href="../prefs/prefs_behavior.html">
15 <link rel="import" href="../prefs/prefs.html"> 18 <link rel="import" href="../prefs/prefs.html">
16 <link rel="import" href="../route.html"> 19 <link rel="import" href="../route.html">
17 <link rel="import" href="../settings_shared_css.html"> 20 <link rel="import" href="../settings_shared_css.html">
18 21
19 <dom-module id="settings-lock-screen"> 22 <dom-module id="settings-lock-screen">
20 <template> 23 <template>
21 <style include="settings-shared action-link"> 24 <style include="settings-shared action-link">
25 #easyUnlock .start {
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
28 * ensure the easy unlock content looks correct. */
29 padding: 11px 0;
30 }
31
22 .radio-indent { 32 .radio-indent {
23 -webkit-margin-start: 36px; 33 -webkit-margin-start: 36px;
24 } 34 }
25 </style> 35 </style>
26 36
27 <div> 37 <div>
28 <div class="list-frame"> 38 <div class="list-frame">
29 <paper-radio-group selected="{{selectedUnlockType}}"> 39 <paper-radio-group selected="{{selectedUnlockType}}">
30 <paper-radio-button name="password"> 40 <paper-radio-button name="password">
31 $i18n{lockScreenPasswordOnly} 41 $i18n{lockScreenPasswordOnly}
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 </div> 78 </div>
69 </div> 79 </div>
70 <button class="subpage-arrow" is="paper-icon-button-light" 80 <button class="subpage-arrow" is="paper-icon-button-light"
71 aria-label="$i18n{lockScreenEditFingerprints}" 81 aria-label="$i18n{lockScreenEditFingerprints}"
72 aria-describedby="lockScreenEditFingerprintsSecondary"></butto n> 82 aria-describedby="lockScreenEditFingerprintsSecondary"></butto n>
73 </div> 83 </div>
74 </iron-collapse> 84 </iron-collapse>
75 </div> 85 </div>
76 </template> 86 </template>
77 87
88 <template is="dom-if" if="[[easyUnlockAllowed_]]">
89 <div id="easyUnlock" class="settings-box two-line">
90 <div class="start">
91 <div>$i18n{easyUnlockSectionTitle}</div>
92 <div class="secondary">
93 [[getEasyUnlockDescription_(easyUnlockEnabled_,
94 '$i18nPolymer{easyUnlockDescription}',
95 '$i18nPolymer{easyUnlockSetupIntro}')]]
96 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}">
97 $i18n{learnMore}
98 </a>
99 <template is="dom-if" if="[[getShowEasyUnlockToggle_(
100 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]">
101 <settings-toggle-button
102 pref="{{prefs.easy_unlock.proximity_required}}"
103 label="$i18n{easyUnlockRequireProximityLabel}">
104 </settings-toggle-button>
105 </template>
106 </div>
107 </div>
108 <div class="secondary-action">
109 <template is="dom-if" if="[[!easyUnlockEnabled_]]">
110 <paper-button id="easyUnlockSetup" class="secondary-button"
111 on-tap="onEasyUnlockSetupTap_">
112 $i18n{easyUnlockSetupButton}
113 </paper-button>
114 </template>
115 <template is="dom-if" if="[[easyUnlockEnabled_]]">
116 <paper-button id="easyUnlockTurnOff" class="secondary-button"
117 on-tap="onEasyUnlockTurnOffTap_">
118 $i18n{easyUnlockTurnOffButton}
119 </paper-button>
120 </template>
121 </div>
122 </div>
123 </template>
124
78 <settings-password-prompt-dialog id="passwordPrompt" 125 <settings-password-prompt-dialog id="passwordPrompt"
79 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> 126 on-close="onPasswordClosed_" set-modes="{{setModes_}}">
80 </settings-password-prompt-dialog> 127 </settings-password-prompt-dialog>
128
81 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 129 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
82 set-modes="[[setModes_]]"> 130 set-modes="[[setModes_]]">
83 </settings-setup-pin-dialog> 131 </settings-setup-pin-dialog>
132
133 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
134 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
135 on-close="onEasyUnlockTurnOffDialogClose_">
136 </easy-unlock-turn-off-dialog>
137 </template>
84 </div> 138 </div>
85 </template> 139 </template>
86 140
87 <script src="lock_screen.js"></script> 141 <script src="lock_screen.js"></script>
88 </dom-module> 142 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698