Commit 045daca0 authored by rsadam@chromium.org's avatar rsadam@chromium.org

Remove numeric hinttext.


BUG=368258

Review URL: https://codereview.chromium.org/252223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268000 0039d316-1c4b-4281-b951-d872f2087c98
parent 2a4b6ea2
...@@ -69,6 +69,10 @@ ...@@ -69,6 +69,10 @@
top: 5%; top: 5%;
} }
:host-context(.hide-hint-text) .hint {
display: none;
}
:host([invert]) .hint { :host([invert]) .hint {
color: #666666; color: #666666;
} }
......
...@@ -424,7 +424,8 @@ Polymer('kb-keyboard', { ...@@ -424,7 +424,8 @@ Polymer('kb-keyboard', {
return; return;
} }
// Triggers swipe hintText if it's a purely vertical swipe. // Triggers swipe hintText if it's a purely vertical swipe.
if (!(direction & (SwipeDirection.LEFT | SwipeDirection.RIGHT))) { if (this.activeKeyset.flick &&
!(direction & (SwipeDirection.LEFT | SwipeDirection.RIGHT))) {
// Check if event is relevant to us. // Check if event is relevant to us.
if ((!detail.endSwipe) || (detail.isComplex)) if ((!detail.endSwipe) || (detail.isComplex))
return; return;
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
-- found in the LICENSE file. -- found in the LICENSE file.
--> -->
<polymer-element name="kb-keyset" attributes="align isDefault nextKeyset pitch <polymer-element name="kb-keyset" attributes="align flick isDefault nextKeyset
weightRight weightTop weightBottom" on-key-up="{{keyUp}}" pitch weightRight weightTop weightBottom" on-key-up="{{keyUp}}"
on-key-longpress="{{keyLongpress}}"> on-key-longpress="{{keyLongpress}}">
<template> <template>
<style> <style>
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
Polymer('kb-keyset', { Polymer('kb-keyset', {
align: "center", align: "center",
// Propagate flick gestures to keys in this keyset.
flick: true,
isDefault: false, isDefault: false,
nextKeyset: undefined, nextKeyset: undefined,
// Weight offsets for positioning the keyset. // Weight offsets for positioning the keyset.
......
...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
--> -->
<kb-keyset id="qwerty-upper" pitch="10 20"> <kb-keyset id="qwerty-upper" flick=false pitch="10 20">
<kb-row> <kb-row class="hide-hint-text">
<kb-key-sequence keys="QWERTYUIOP" hintTexts="1234567890"> <kb-key-sequence keys="QWERTYUIOP" hintTexts="1234567890"></kb-key-sequence>
</kb-key-sequence>
<kb-key class="dark" char="&#x0008;" image="backspace.png" <kb-key class="dark" char="&#x0008;" image="backspace.png"
repeat sound="keypress-delete" stretch weight="110"></kb-key> repeat sound="keypress-delete" stretch weight="110"></kb-key>
</kb-row> </kb-row>
...@@ -39,10 +38,9 @@ ...@@ -39,10 +38,9 @@
</kb-altkey-container> </kb-altkey-container>
</kb-keyset> </kb-keyset>
<kb-keyset id="qwerty-lower" isDefault=true pitch="10 20"> <kb-keyset id="qwerty-lower" flick=false isDefault=true pitch="10 20">
<kb-row> <kb-row class="hide-hint-text">
<kb-key-sequence keys="qwertyuiop" hintTexts="1234567890"> <kb-key-sequence keys="qwertyuiop" hintTexts="1234567890"></kb-key-sequence>
</kb-key-sequence>
<kb-key class="dark" char="&#x0008;" repeat stretch align="right" <kb-key class="dark" char="&#x0008;" repeat stretch align="right"
image="backspace.png" sound="keypress-delete" weight="110"></kb-key> image="backspace.png" sound="keypress-delete" weight="110"></kb-key>
</kb-row> </kb-row>
......
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