Skip to content

Commit

Permalink
[CrOS cellular] Add hidden button state
Browse files Browse the repository at this point in the history
This CL adds a new button state HIDDEN to the list of available
cellular setup button states.

(cherry picked from commit f7a1ccd)

Bug: 1196507
Change-Id: Ie0d281034f4f14a6cf3d9e05a544a3284dea220f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2815653
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#871199}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2826564
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/4472@{#78}
Cr-Branched-From: 3d60439-refs/heads/master@{#870763}
  • Loading branch information
Theo Johnson-Kanu authored and Chromium LUCI CQ committed Apr 14, 2021
1 parent f782a44 commit 37db61a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ suite('CellularSetupButtonBarTest', function() {
});

test('individual buttons are hidden', function() {
setStateForAllButtons(undefined);
setStateForAllButtons(cellularSetup.ButtonState.HIDDEN);
assertTrue(isButtonHidden(buttonBar.$$('#backward')));
assertTrue(isButtonHidden(buttonBar.$$('#cancel')));
assertTrue(isButtonHidden(buttonBar.$$('#forward')));
Expand All @@ -93,6 +93,8 @@ suite('CellularSetupButtonBarTest', function() {
test('default focus is on first button if rest are hidden', function() {
buttonBar.buttonState = {
backward: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.HIDDEN,
forward: cellularSetup.ButtonState.HIDDEN,
};
buttonBar.focusDefaultButton();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ suite('CrComponentsEsimFlowUiTest', function() {
assertEquals(!!finalPage.$$('.error'), shouldBeShowingError);
assertEquals(
cellularSetup.ButtonState.ENABLED, eSimPage.buttonState.forward);
assertEquals(undefined, eSimPage.buttonState.backward);
assertEquals(undefined, eSimPage.buttonState.cancel);
assertEquals(
cellularSetup.ButtonState.HIDDEN, eSimPage.buttonState.backward);
assertEquals(cellularSetup.ButtonState.HIDDEN, eSimPage.buttonState.cancel);
assertEquals(eSimPage.forwardButtonLabel, 'Done');
let exitCellularSetupEventFired = false;
eSimPage.addEventListener('exit-cellular-setup', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ Polymer({
* @private
*/
isButtonHidden_(buttonName) {
return !this.getButtonBarState_(buttonName);
const state = this.getButtonBarState_(buttonName);
return state === cellularSetup.ButtonState.HIDDEN;
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ cr.define('cellularSetup', function() {
/* #export */ const ButtonState = {
ENABLED: 1,
DISABLED: 2,
HIDDEN: 3,
};

/** @enum {number} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,8 @@ cr.define('cellular_setup', function() {
case ESimUiState.SETUP_FINISH:
this.forwardButtonLabel = this.i18n('done');
buttonState = {
backward: cellularSetup.ButtonState.HIDDEN,
cancel: cellularSetup.ButtonState.HIDDEN,
forward: cellularSetup.ButtonState.ENABLED,
};
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ cr.define('cellularSetup', function() {
case PSimUIState.TIMEOUT_FINISH_ACTIVATION:
this.forwardButtonLabel = this.i18n('done');
buttonState = {
backward: cellularSetup.ButtonState.HIDDEN,
cancel: cellularSetup.ButtonState.HIDDEN,
forward: cellularSetup.ButtonState.ENABLED,
};
break;
Expand Down

0 comments on commit 37db61a

Please sign in to comment.