chrome/browser/resources/settings/people_page/lock_screen.html - Issue 2208473007: Rework quick unlock settings to follow new specs.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Fix closure (bad merge) 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

« no previous file with comments | « chrome/browser/resources/settings/people_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <link rel="import" href="chrome://resources/html/i18n_behavior.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">

	4 <link rel="import" href="/people_page/lock_state_behavior.html">

	5 <link rel="import" href="/people_page/password_prompt_dialog.html">

	6 <link rel="import" href="/people_page/setup_pin_dialog.html">

	7 <link rel="import" href="/prefs/prefs_behavior.html">

	8 <link rel="import" href="/route.html">

	9 <link rel="import" href="/settings_shared_css.html">

	10

	11 <dom-module id="settings-lock-screen">

	12 <template>

	13 <style include="settings-shared"></style>

	14 <style>

	15 .radio-indent {

	16 margin-left: 28px;

	17 }

	18

	19 paper-button {

	20 text-transform: none;

	21 }

	22 </style>

	23

	24 <div>

	25 <div class="list-frame">

	26 <paper-radio-group selected="{{selectedUnlockType}}">

	27 <paper-radio-button name="password">

	28 $i18n{lockScreenPasswordOnly}

	29 </paper-radio-button>

	30 <paper-radio-button name="pin+password">

	31 $i18n{lockScreenPinOrPassword}

	32 </paper-radio-button>

	33 <div class="settings-box continuation radio-indent"

	34 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">

	35 <paper-button is="action-link" on-tap="onConfigurePin_">

	36 [[getSetupPinText_(hasPin)]]

	37 </paper-button>

	38 </div>

	39 </paper-radio-group>

	40 </div>

	41

	42 <div class="settings-box single-column">

	43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"

	44 label="$i18n{enableScreenlock}">

	45 </settings-checkbox>

	46 </div>

	47

	48 <settings-password-prompt-dialog id="passwordPrompt"

	49 on-close="onPasswordClosed_"

	50 set-modes="{{setModes_}}">

	51 </settings-password-prompt-dialog>

	52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"

	53 set-modes="[[setModes_]]">

	54 </settings-setup-pin-dialog>

	55 </div>

	56 </template>

	57

	58 <script src="lock_screen.js"></script>

	59 </dom-module>

OLD	NEW