Skip to content

Commit

Permalink
[CrOS MultiDevice] Update setup flow buttons
Browse files Browse the repository at this point in the history
Update the multi-device setup flow button bar to include the
following buttons: Back, Cancel, Forward. Set the buttons
on each page to conform to the following specs (sans padding):
https://drive.google.com/file/d/1UqHV67OrdGT0_G0L98nV5IVr26OkHu9F/view.

Screenshots with this patch applied:
start screen: https://drive.google.com/open?id=1QlWKjesaBpt0ZtNQ_vONBqu1czUWiezz
start screen (OOBE): https://drive.google.com/open?id=1kh9UNYjLaSbP-zE0U89sniZSb9Sbhk8fMw
password screen: https://drive.google.com/open?id=1olKePztZ9pqxPHupVCdrwEBZ1pyfzLA_
success screen: https://drive.google.com/open?id=1zpZfnowdpOvge8nteqsjBHuUin_I9HgW

Bug: 889574
Change-Id: I7a0834b58b6f2458e5ab6641aa5b323cb5fc32fe
Tested: Manual; ./out/Default/browser_tests --gtest_filter=*MultiDevice*
Reviewed-on: https://chromium-review.googlesource.com/c/1254760
Reviewed-by: Alexander Alekseev <[email protected]>
Reviewed-by: Kyle Horimoto <[email protected]>
Commit-Queue: Josh Nohle <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#599737}(cherry picked from commit 8057370)
Reviewed-on: https://chromium-review.googlesource.com/c/1284444
Reviewed-by: Jeremy Klein <[email protected]>
Cr-Commit-Position: refs/branch-heads/3578@{#64}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
  • Loading branch information
nohle authored and Jeremy Klein committed Oct 16, 2018
1 parent ed37d83 commit ef0296c
Show file tree
Hide file tree
Showing 14 changed files with 325 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
on-setup-exited="onExitRequested_"
forward-button-text="{{forwardButtonText_}}"
forward-button-disabled="{{forwardButtonDisabled_}}"
backward-button-text="{{backwardButtonText_}}">
<oobe-text-button slot="backward-button">
<div>[[backwardButtonText_]]</div>
cancel-button-text="{{cancelButtonText_}}">
<oobe-text-button slot="cancel-button">
<div>[[cancelButtonText_]]</div>
</oobe-text-button>
<oobe-next-button id="next-button" slot="forward-button"
disabled$="[[forwardButtonDisabled_]]">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ cr.define('multidevice_setup', function() {
},

/**
* Text to be shown on the backward navigation button.
* Text to be shown on the cancel button.
* @private {string|undefined}
*/
backwardButtonText_: {
cancelButtonText_: {
type: String,
value: '',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<template>
<style include="multidevice-setup-shared">
#backward-button,
#cancel-button,
#forward-button {
align-items: center;
display: flex;
Expand All @@ -21,11 +22,16 @@
on-forward-button-focus-requested="onForwardButtonFocusRequested_"
forward-button-text="{{forwardButtonText_}}"
forward-button-disabled="{{forwardButtonDisabled_}}"
cancel-button-text="{{cancelButtonText_}}"
backward-button-text="{{backwardButtonText_}}">
<paper-button id="backward-button"
slot="backward-button" class="cancel-button">
[[backwardButtonText_]]
</paper-button>
<paper-button id="cancel-button"
slot="cancel-button" class="cancel-button">
[[cancelButtonText_]]
</paper-button>
<paper-button id="forward-button"
slot="forward-button" class="action-button"
disabled$="[[forwardButtonDisabled_]]">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ Polymer({
value: false,
},

/**
* Text to be shown on the cancel navigation button.
* @private {string|undefined}
*/
cancelButtonText_: {
type: String,
value: '',
},

/**
* Text to be shown on the backward navigation button.
* @private {string|undefined}
Expand Down
Loading

0 comments on commit ef0296c

Please sign in to comment.