chrome/browser/resources/settings/people_page/lock_screen.html - Issue 2236213002: Add quick unlock Settings in options page

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

Unified 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: incorporate comments from jdufault@ 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/people_page/lock_screen.html

diff --git a/chrome/browser/resources/settings/people_page/lock_screen.html b/chrome/browser/resources/settings/people_page/lock_screen.html

index 63188550791108426e157e8b53dbb6fe9795fce9..d7d89a0184fce0806f16058755127af61d9a6b32 100644

--- a/chrome/browser/resources/settings/people_page/lock_screen.html

+++ b/chrome/browser/resources/settings/people_page/lock_screen.html

@@ -16,19 +16,28 @@

margin-left: 28px;

}

+ .radio-indent[hidden] {

+ display: none;

+ }

+ .single-column[hidden] {

+ display: none;

+ }

paper-button {

text-transform: none;

}

</style>

<div>

+ <!--TODO(xiaoyinh@): Revert changes to i18n text

+ once we don't need to support options -->

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

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

- $i18n{lockScreenPasswordOnly}

+ [[i18n('lockScreenPasswordOnly')]]

</paper-radio-button>

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

- $i18n{lockScreenPinOrPassword}

+ [[i18n('lockScreenPinOrPassword')]]

</paper-radio-button>

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

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

@@ -39,7 +48,8 @@

</paper-radio-group>

</div>

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

+ <div class="settings-box single-column"

+ hidden$="[[hideEnableScreenlock]]">

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

label="$i18n{enableScreenlock}">

</settings-checkbox>