Commit f0e8e86f authored by Sammie Quon's avatar Sammie Quon Committed by Commit Bot

settings: Update ripples on setup PIN keyboard.

Also fix a bug where continue button was still enabled after tabbing to
and pressing backspace with the keyboard.

Test: manual
Bug: 855014, 869641
Change-Id: I0f3e570fc87b1a2e60de112de47558885f5d4847
Reviewed-on: https://chromium-review.googlesource.com/1173139Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583030}
parent 5f734fa2
...@@ -263,6 +263,8 @@ Polymer({ ...@@ -263,6 +263,8 @@ Polymer({
this.quickUnlockPrivate_.checkCredential( this.quickUnlockPrivate_.checkCredential(
chrome.quickUnlockPrivate.QuickUnlockMode.PIN, chrome.quickUnlockPrivate.QuickUnlockMode.PIN,
this.pinKeyboardValue_, this.processPinProblems_.bind(this)); this.pinKeyboardValue_, this.processPinProblems_.bind(this));
} else {
this.enableSubmit_ = false;
} }
return; return;
} }
......
...@@ -116,8 +116,7 @@ ...@@ -116,8 +116,7 @@
} }
paper-ripple { paper-ripple {
border-radius: 100px; color: var(--google-grey-700);
color: #000;
height: 48px; height: 48px;
left: 6px; left: 6px;
width: 48px; width: 48px;
...@@ -169,19 +168,19 @@ ...@@ -169,19 +168,19 @@
<paper-button class="digit-button" on-tap="onNumberTap_" value="1" <paper-button class="digit-button" on-tap="onNumberTap_" value="1"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard1')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard1')]]</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="2" <paper-button class="digit-button" on-tap="onNumberTap_" value="2"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard2')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard2')]]</inner-text>
<inner-text class="letter">ABC</inner-text> <inner-text class="letter">ABC</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="3" <paper-button class="digit-button" on-tap="onNumberTap_" value="3"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard3')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard3')]]</inner-text>
<inner-text class="letter">DEF</inner-text> <inner-text class="letter">DEF</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
</div> </div>
<div class="row"> <div class="row">
...@@ -189,19 +188,19 @@ ...@@ -189,19 +188,19 @@
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard4')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard4')]]</inner-text>
<inner-text class="letter">GHI</inner-text> <inner-text class="letter">GHI</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="5" <paper-button class="digit-button" on-tap="onNumberTap_" value="5"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard5')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard5')]]</inner-text>
<inner-text class="letter">JKL</inner-text> <inner-text class="letter">JKL</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="6" <paper-button class="digit-button" on-tap="onNumberTap_" value="6"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard6')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard6')]]</inner-text>
<inner-text class="letter">MNO</inner-text> <inner-text class="letter">MNO</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
</div> </div>
<div class="row"> <div class="row">
...@@ -209,19 +208,19 @@ ...@@ -209,19 +208,19 @@
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard7')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard7')]]</inner-text>
<inner-text class="letter">PQRS</inner-text> <inner-text class="letter">PQRS</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="8" <paper-button class="digit-button" on-tap="onNumberTap_" value="8"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard8')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard8')]]</inner-text>
<inner-text class="letter">TUV</inner-text> <inner-text class="letter">TUV</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<paper-button class="digit-button" on-tap="onNumberTap_" value="9" <paper-button class="digit-button" on-tap="onNumberTap_" value="9"
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard9')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard9')]]</inner-text>
<inner-text class="letter">WXYZ</inner-text> <inner-text class="letter">WXYZ</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
</div> </div>
<div class="row bottom-row"> <div class="row bottom-row">
...@@ -230,7 +229,7 @@ ...@@ -230,7 +229,7 @@
noink> noink>
<inner-text class="number">[[i18n('pinKeyboard0')]]</inner-text> <inner-text class="number">[[i18n('pinKeyboard0')]]</inner-text>
<inner-text class="letter">+</inner-text> <inner-text class="letter">+</inner-text>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</paper-button> </paper-button>
<div id="backspaceButtonContainer"> <div id="backspaceButtonContainer">
<paper-icon-button id="backspaceButton" class="digit-button" <paper-icon-button id="backspaceButton" class="digit-button"
...@@ -242,7 +241,7 @@ ...@@ -242,7 +241,7 @@
title="[[i18n('pinKeyboardDeleteAccessibleName')]]" title="[[i18n('pinKeyboardDeleteAccessibleName')]]"
noink> noink>
</paper-icon-button> </paper-icon-button>
<paper-ripple> <paper-ripple class="circle" center></paper-ripple>
</div> </div>
</div> </div>
</div> </div>
......
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