Commit b4a04f01 authored by Thomas Tellier's avatar Thomas Tellier Committed by Commit Bot

Reverting CL 1332929 to enable OOBE's PIN setup input

Bug: 900351, b/145275297, 1025736
Change-Id: Ic00d70ff5521ca9b9f10eead8fab17c1d590e23f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939790
Commit-Queue: Thomas Tellier <tellier@google.com>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719961}
parent 067f5a34
...@@ -107,8 +107,7 @@ ...@@ -107,8 +107,7 @@
set-modes="{{setModes}}" set-modes="{{setModes}}"
quick-unlock-private="[[quickUnlockPrivate_]]" quick-unlock-private="[[quickUnlockPrivate_]]"
write-uma="[[writeUma_]]" write-uma="[[writeUma_]]"
class="focus-on-show" class="focus-on-show">
is-incognito-ui>
</setup-pin-keyboard> </setup-pin-keyboard>
</div> </div>
<div slot="footer" class="flex layout vertical center <div slot="footer" class="flex layout vertical center
......
...@@ -177,7 +177,6 @@ ...@@ -177,7 +177,6 @@
} }
#pinInput[make-contrast] { #pinInput[make-contrast] {
--cr-disabled-opacity: var(--dark-primary-opacity);
opacity: var(--dark-primary-opacity); opacity: var(--dark-primary-opacity);
} }
...@@ -200,7 +199,7 @@ ...@@ -200,7 +199,7 @@
placeholder="[[getInputPlaceholder_(enablePassword, placeholder="[[getInputPlaceholder_(enablePassword,
enablePlaceholder)]]" enablePlaceholder)]]"
on-keydown="onInputKeyDown_" force-underline="true" on-keydown="onInputKeyDown_" force-underline="true"
disabled="[[crInputDisabled_(disabled, isIncognitoUi)]]"> disabled="[[disabled]]">
</cr-input> </cr-input>
</div> </div>
<slot select="[problem]"></slot> <slot select="[problem]"></slot>
......
...@@ -158,15 +158,6 @@ Polymer({ ...@@ -158,15 +158,6 @@ Polymer({
value: false, value: false,
}, },
/**
* Turns on "incognito mode". (FIXME after https://crbug.com/900351 is
* fixed).
*/
isIncognitoUi: {
type: Boolean,
value: false,
},
/** /**
* The aria label to be used for the input element. * The aria label to be used for the input element.
*/ */
...@@ -533,13 +524,5 @@ Polymer({ ...@@ -533,13 +524,5 @@ Polymer({
return this.passwordElement || return this.passwordElement ||
(/** @type {CrInputElement} */ (this.$.pinInput)).inputElement; (/** @type {CrInputElement} */ (this.$.pinInput)).inputElement;
}, },
/**
* Needed for "incognito mode". (FIXME after https://crbug.com/900351 is
* fixed).
*/
crInputDisabled_: function() {
return this.disabled || this.isIncognitoUi;
},
}); });
})(); })();
...@@ -81,8 +81,7 @@ Where: ...@@ -81,8 +81,7 @@ Where:
<pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_" <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_"
on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}" on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}"
has-error="[[hasError_(problemMessageId_, problemClass_)]]" has-error="[[hasError_(problemMessageId_, problemClass_)]]"
enable-placeholder="[[enablePlaceholder]]" enable-letters enable-placeholder="[[enablePlaceholder]]" enable-letters>
is-incognito-ui="[[isIncognitoUi]]">
<!-- Warning/error; only shown if title is hidden. --> <!-- Warning/error; only shown if title is hidden. -->
<div id="problemDiv" class$="[[problemClass_]]" <div id="problemDiv" class$="[[problemClass_]]"
invisible$="[[!problemMessageId_]]" problem> invisible$="[[!problemMessageId_]]" problem>
......
...@@ -135,15 +135,6 @@ Polymer({ ...@@ -135,15 +135,6 @@ Polymer({
type: Boolean, type: Boolean,
value: false, value: false,
}, },
/**
* Turns on "incognito mode". (FIXME after https://crbug.com/900351 is
* fixed).
*/
isIncognitoUi: {
type: Boolean,
value: false,
},
}, },
focus: function() { focus: function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment