I have yet to create the modified specs for this. I'll keep you posted.

Thanks! When do you think they'll be ready to share with eng?

Sorry I've been swamped with other stuff. Hopefully next week.

Assigning this to Elizabeth. Thanks for working on this.

Hi all,
Please review the design before I put together the spec. Feel free to leave comments in gallery.

https://gallery.googleplex.com/projects/MCHbtQVoQ2HCZfSHzqDNTRuU/files/MCEElebvarL7pjKZW_ulHUw2

Hi Elizabeth,

I have a two questions.
Just to be clear, it will be PIN & Password right (and presumably Pattern & Password)?
Are we moving smart lock from people section to screen lock?

Hey Elizabeth, I added some comments on the mocks.

@Sammie -- I agree it should be "PIN and Password" instead of "PIN", and yes Smart lock should now be in the Screen lock sub-page.

@Tom - Ok. I moved the easy unlock to the lock screen. BTW, the easy unlock setup does not work (both before and after the move). Is this known?

Could you describe what you're seeing? I'm on 59.0.3055.0 (Official Build) canary (64-bit) and the easy unlock setup flow launches when I click "SET UP".

My mistake, I was using a account on my chromebook that was different than the ones on my phone. It works both before and after now. :-)

Tom, is this an actual blocker for 59?

Re-assigning to sammiequon@ since he is actively working on it and it is listed as blocking  issue 684849 .

Presumably moving easy unlock to the subpage is sufficient for 59?

https://codereview.chromium.org/2787153002/

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/598efef49cb88d56172cf5d69f7cccde5cbbc4bb

commit 598efef49cb88d56172cf5d69f7cccde5cbbc4bb
Author: sammiequon <sammiequon@chromium.org>
Date: Wed Apr 12 22:21:23 2017

MD Settings: Move easy unlock from people to lock screen.

Move easy unlock from people to lock screen. Also need to hide it from options, once it is moved.

BUG= 703998 
TEST=browser_tests --gtest_filter="SettingsEasyUnlockBrowserTest*"
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2787153002
Cr-Commit-Position: refs/heads/master@{#464172}

[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.js
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/options/compiled_resources.gyp
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/options_resources.grd
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/settings/people_page/compiled_resources2.gyp
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/settings/people_page/lock_screen.js
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/settings/people_page/people_page.html
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/resources/settings/people_page/people_page.js
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/browser/ui/webui/options/options_ui.cc
[modify] https://crrev.com/598efef49cb88d56172cf5d69f7cccde5cbbc4bb/chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js

Changes for M59:
1) Add padding between “Cancel” and “Continue”/”Confirm” buttons in PIN setup dialog (see buttons spec [1])
2) On the subpage, the spacing between the title ("Screen lock") and the first item ("Password only") should be reduced to 24px (see subpage spec [2])
3) The "Set up PIN" / "Change PIN" button should be the same row as "PIN or password" (see how Sign Out appears in the row spec [3]; same pattern is used for "SET UP" button with Smart lock)

[1] https://folio.googleplex.com/chrome-ux-specs-and-sources/Chrome%20Inner%20Pages/03-Settings/specs#%2FSPEC-settings_buttons.png%3Fz=half
[2] https://folio.googleplex.com/chrome-ux-specs-and-sources/Chrome%20Inner%20Pages/03-Settings/specs#%2FSPEC-settings_structure-subpage.png%3Fz=half&c=show
[3] https://folio.googleplex.com/chrome-ux-specs-and-sources/Chrome%20Inner%20Pages/03-Settings/specs#%2FSPEC-settings_rows.png%3Fz=half

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/32d9f5075ba7f767d2c6c6d41794dc70b5ff7bf3

commit 32d9f5075ba7f767d2c6c6d41794dc70b5ff7bf3
Author: sammiequon <sammiequon@chromium.org>
Date: Sat Apr 22 19:17:27 2017

md-settings: Tweak padding for action/cancel buttons and subpage header.

Add left right padding to action/cancel buttons.
Reduce bottom padding for settings subpage header.
Also removed a todo for button opacity(saw a new value in specs).

Link to specs in the bug.

TEST=manual
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2831963004
Cr-Commit-Position: refs/heads/master@{#466545}

[modify] https://crrev.com/32d9f5075ba7f767d2c6c6d41794dc70b5ff7bf3/chrome/browser/resources/settings/settings_page/settings_subpage.html
[modify] https://crrev.com/32d9f5075ba7f767d2c6c6d41794dc70b5ff7bf3/ui/webui/resources/cr_elements/shared_style_css.html

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/98593cf1c4918b063b60627f439d8f97cd6489ab

commit 98593cf1c4918b063b60627f439d8f97cd6489ab
Author: sammiequon <sammiequon@chromium.org>
Date: Tue Apr 25 00:40:14 2017

md settings: Change action link to button on lock screen.

Removed the setup pin link and put a button inside the radio button instead to fire up the setup pin dialog.

https://screenshot.googleplex.com/Yvp9brRd2wS

Upstream paper-radio-button PR:
https://github.com/PolymerElements/paper-radio-button/pull/119

TEST=manual
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2823713002
Cr-Commit-Position: refs/heads/master@{#466841}

[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/app/settings_strings.grdp
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/browser/resources/settings/people_page/lock_screen.js
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/browser/ui/webui/options/browser_options_handler.cc
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/third_party/polymer/v1_0/chromium.patch
[modify] https://crrev.com/98593cf1c4918b063b60627f439d8f97cd6489ab/third_party/polymer/v1_0/components-chromium/paper-radio-button/paper-radio-button.html

With cancel on Set up pin button there is a blue rectangle box left. Is this known and being fixed here?

Test version Chrome OS 9460.11.0/59.0.3071.25

Deleted: Screenshot 2017-04-25 at 10.40.41 AM.png 171 KB

	Screenshot 2017-04-25 at 10.40.41 AM.png 171 KB View Download

rookrishna@ - This should be fixed now that the Set up pin Button is a button and not a link.

@sammiequon thanks for confirming.

This bug requires manual review: There is .grd file changes and we are only 40 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), gkihumba@(ChromeOS), Abdul Syed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b546eb97eb9f5c8683f0560a625208d5217a3d16

commit b546eb97eb9f5c8683f0560a625208d5217a3d16
Author: tsergeant <tsergeant@chromium.org>
Date: Wed Apr 26 05:08:31 2017

MD WebUI: Fix Action/Cancel button padding in MD History/Bookmarks

This fixes an issue where action/cancel buttons in MD History/Bookmarks
(and possibly other pages) had no vertical padding, after the default
paper-button padding was disabled in crrev.com/466545.

BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2837763002
Cr-Commit-Position: refs/heads/master@{#467238}

[modify] https://crrev.com/b546eb97eb9f5c8683f0560a625208d5217a3d16/ui/webui/resources/cr_elements/shared_style_css.html

I think this should be tested first on tot before being considered for M59 merge.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/bafb3e901459a1abc80ef00ec537d6520db03ff6

commit bafb3e901459a1abc80ef00ec537d6520db03ff6
Author: sammiequon <sammiequon@chromium.org>
Date: Wed May 10 05:38:20 2017

md settings: Update lock screen to match new mocks.

Mocks are here https://gallery.googleplex.com/projects/MCHbtQVoQ2HCZfSHzqDNTRuU/files/MCFvOc4T9u7Awmru3H3e7QDjwMSJbxAVNpw.
This CL :
- Fixes a bug with password prompt paper-input not receiving focus on first open.
- Changes pin_keyboard.html to use paper-input instead of input. (mocks have blue lines and such)
- Rearranged some items on the lock screen page and added some lines.
- Ran cl format --js.

Left the new error message for another CL. (page 11/12 on the mocks)

Screenshots:
https://screenshot.googleplex.com/P4pLToSntY6
https://screenshot.googleplex.com/ooOYgDy71hZ

TEST=browser_tests --gtest_filter="CrSettingsPeoplePageLockScreenTest.*
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2841313002
Cr-Commit-Position: refs/heads/master@{#470483}

[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/app/settings_strings.grdp
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/chromeos/quick_unlock/compiled_resources2.gyp
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.js
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/settings/people_page/password_prompt_dialog.html
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/resources/settings/people_page/password_prompt_dialog.js
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/ui/webui/options/browser_options_handler.cc
[modify] https://crrev.com/bafb3e901459a1abc80ef00ec537d6520db03ff6/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f

commit e639bd5d4f9cd62ded72a58a8b5adf38c553e67f
Author: Sammie Quon <sammiequon@google.com>
Date: Thu May 11 17:55:53 2017

[Merge to M59] md settings: Change action link to button on lock screen.

Removed the setup pin link and put a button inside the radio button instead to fire up the setup pin dialog.

https://screenshot.googleplex.com/Yvp9brRd2wS

Upstream paper-radio-button PR:
https://github.com/PolymerElements/paper-radio-button/pull/119

TEST=manual
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2823713002
Cr-Original-Commit-Position: refs/heads/master@{#466841}
Review-Url: https://codereview.chromium.org/2876003002 .
Cr-Commit-Position: refs/branch-heads/3071@{#515}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}

[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/app/settings_strings.grdp
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/resources/settings/people_page/lock_screen.js
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/ui/webui/options/browser_options_handler.cc
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/third_party/polymer/v1_0/chromium.patch
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/third_party/polymer/v1_0/components-chromium/paper-radio-button/paper-radio-button.html

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f

commit e639bd5d4f9cd62ded72a58a8b5adf38c553e67f
Author: Sammie Quon <sammiequon@google.com>
Date: Thu May 11 17:55:53 2017

[Merge to M59] md settings: Change action link to button on lock screen.

Removed the setup pin link and put a button inside the radio button instead to fire up the setup pin dialog.

https://screenshot.googleplex.com/Yvp9brRd2wS

Upstream paper-radio-button PR:
https://github.com/PolymerElements/paper-radio-button/pull/119

TEST=manual
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2823713002
Cr-Original-Commit-Position: refs/heads/master@{#466841}
Review-Url: https://codereview.chromium.org/2876003002 .
Cr-Commit-Position: refs/branch-heads/3071@{#515}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}

[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/app/settings_strings.grdp
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/resources/settings/people_page/lock_screen.js
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/ui/webui/options/browser_options_handler.cc
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/third_party/polymer/v1_0/chromium.patch
[modify] https://crrev.com/e639bd5d4f9cd62ded72a58a8b5adf38c553e67f/third_party/polymer/v1_0/components-chromium/paper-radio-button/paper-radio-button.html

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/13ae67b02915295a69a6ceea4ba8c7552b4f29cc

commit 13ae67b02915295a69a6ceea4ba8c7552b4f29cc
Author: sammiequon <sammiequon@chromium.org>
Date: Tue May 16 18:22:45 2017

md settings: Move setup pin error message.

Mocks are here https://gallery.googleplex.com/projects/MCHbtQVoQ2HCZfSHzqDNTRuU/files/MCFvOc4T9u7Awmru3H3e7QDjwMSJbxAVNpw. (page 11/12)

Moves setup pin error/warning message inside pin keyboard element.Have not received positioning/sizing details. But this CL covers the functionality.

Screenshots:
https://screenshot.googleplex.com/qsWXoWteyDr

TEST=browser_tests --gtest_filter="CrSettingsPeoplePageSetupPinDialogTest.*
BUG= 703998 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2848483002
Cr-Commit-Position: refs/heads/master@{#472164}

[modify] https://crrev.com/13ae67b02915295a69a6ceea4ba8c7552b4f29cc/chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html
[modify] https://crrev.com/13ae67b02915295a69a6ceea4ba8c7552b4f29cc/chrome/browser/resources/settings/icons.html
[modify] https://crrev.com/13ae67b02915295a69a6ceea4ba8c7552b4f29cc/chrome/browser/resources/settings/people_page/setup_pin_dialog.html
[modify] https://crrev.com/13ae67b02915295a69a6ceea4ba8c7552b4f29cc/chrome/browser/resources/settings/people_page/setup_pin_dialog.js

Is there still work to be done here for 59?

stevenjb@ - This is just pending whether https://codereview.chromium.org/2882513002/ gets approved for merge. If it is not, then we are done here.

tbuckley@ - Do you really want the paddings in M59?

Merge for CL in #33 is not happening. Work for M59 is done here.

ChromeOS 9574.0.0, 60.0.3105.0 and 9460.48.0, 59.0.3071.67