diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 21:27:10 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 21:27:10 +0000 |
| commit | 3699af9fae872b8b9deee04cc7ccd862b82d464e (patch) | |
| tree | c1cad568937aa7d3fa92217fe58b5d068a766c78 | |
| parent | d7969d79553611486f231b71fb6a9699ea3e2413 (diff) | |
| download | chromium_src-3699af9fae872b8b9deee04cc7ccd862b82d464e.zip chromium_src-3699af9fae872b8b9deee04cc7ccd862b82d464e.tar.gz chromium_src-3699af9fae872b8b9deee04cc7ccd862b82d464e.tar.bz2 | |
Fix webui keyboard regression
We are iterating on layout of extension keyboard fast. To avoid maintain layouts
for extension keyboard and webui keyboard, and avoid unintentionally break webui
keyboard during experiment on extension keyboard, this CL creates webui_index.html
to completely seperate them.
Note: this is temporary, once we have dynamical layout loading mechanism implemented,
we should remove webui_index.html file and only use index.html for both webui and
extension keyboard.
BUG=260283
R=bryeung@chromium.org, kevers@chromium.org
Review URL: https://codereview.chromium.org/19157007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211850 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/keyboard/keyboard_resources.grd | 1 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_ui_controller.cc | 2 | ||||
| -rw-r--r-- | ui/keyboard/resources/index.html | 4 | ||||
| -rw-r--r-- | ui/keyboard/resources/layouts/webui_qwerty.html | 168 | ||||
| -rw-r--r-- | ui/keyboard/resources/webui_index.html | 39 |
5 files changed, 127 insertions, 87 deletions
diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd index 1115b7d..22dce1c 100644 --- a/ui/keyboard/keyboard_resources.grd +++ b/ui/keyboard/keyboard_resources.grd @@ -40,6 +40,7 @@ <include name="IDR_KEYBOARD_POLYMER" file="resources/polymer.min.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_KEYBOARD_SPACEBAR_ROW" file="resources/layouts/spacebar-row.html" type="BINDATA" /> <include name="IDR_KEYBOARD_VOICE_INPUT_JS" file="resources/voice_input.js" type="BINDATA" /> + <include name="IDR_KEYBOARD_WEBUI_INDEX" file="resources/webui_index.html" allowexternalscript="true" type="BINDATA" /> <include name="IDR_KEYBOARD_WEBUI_API_ADAPTER_JS" file="resources/webui/api_adapter.js" type="BINDATA" /> <include name="IDR_KEYBOARD_WEBUI_CONSTANTS_JS" file="resources/webui/constants.js" type="BINDATA" /> <include name="IDR_KEYBOARD_WEBUI_MAIN_CSS" file="resources/webui/main.css" type="BINDATA" /> diff --git a/ui/keyboard/keyboard_ui_controller.cc b/ui/keyboard/keyboard_ui_controller.cc index c559b54..8c73f51 100644 --- a/ui/keyboard/keyboard_ui_controller.cc +++ b/ui/keyboard/keyboard_ui_controller.cc @@ -18,7 +18,7 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() { content::WebUIDataSource* source = content::WebUIDataSource::Create(keyboard::kKeyboardWebUIHost); - source->SetDefaultResource(IDR_KEYBOARD_INDEX); + source->SetDefaultResource(IDR_KEYBOARD_WEBUI_INDEX); source->AddResourcePath("elements/kb-accent-container.html", IDR_KEYBOARD_ELEMENTS_ACCENT_CONTAINER); diff --git a/ui/keyboard/resources/index.html b/ui/keyboard/resources/index.html index 213bdfe..97b147a 100644 --- a/ui/keyboard/resources/index.html +++ b/ui/keyboard/resources/index.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML> <!-- - -- Copyright (c) 2013 The Chromium Authors. All rights reserved. + -- Copyright 2013 The Chromium Authors. All rights reserved. -- Use of this source code is governed by a BSD-style license that can be -- found in the LICENSE file. --> @@ -22,7 +22,7 @@ <link rel="import" href="elements/kb-keyset.html"> <link rel="import" href="elements/kb-row.html"> <!-- TODO(kevers|biao): Switch to dynamic loading strategy once supported - in Polymer --> + in Polymer (http://www.crbug.com/260278).--> <link id="dvorak" rel="import" href="layouts/dvorak.html"> <link id="qwerty" rel="import" href="layouts/qwerty.html"> <!--TODO(stevet): Import 'Open Sans' font. --> diff --git a/ui/keyboard/resources/layouts/webui_qwerty.html b/ui/keyboard/resources/layouts/webui_qwerty.html index d06ad61..6b30f71 100644 --- a/ui/keyboard/resources/layouts/webui_qwerty.html +++ b/ui/keyboard/resources/layouts/webui_qwerty.html @@ -6,91 +6,91 @@ <template> <kb-keyset id="qwerty-upper"> - <kb-row class="top"> - <kb-key>Q</kb-key><kb-key>W</kb-key><kb-key accents="E">E</kb-key><kb-key>R</kb-key> - <kb-key>T</kb-key><kb-key>Y</kb-key><kb-key accents="U">U</kb-key> - <kb-key accents="I">I</kb-key><kb-key accents="O">O</kb-key><kb-key>P</kb-key> - </kb-row> - <kb-row> - <div class="half-key-spacer"></div> - <kb-key accents="A">A</kb-key><kb-key>S</kb-key><kb-key>D</kb-key><kb-key>F</kb-key> - <kb-key>G</kb-key><kb-key>H</kb-key><kb-key>J</kb-key><kb-key>K</kb-key> - <kb-key>L</kb-key> - <div class="half-key-spacer"></div> - </kb-row> - <kb-row> - <kb-key class="left-shift padded-left-special dark" toKeyset="up:lower" char="Invalid">shift</kb-key> - <kb-key>Z</kb-key><kb-key>X</kb-key><kb-key>C</kb-key><kb-key>V</kb-key> - <kb-key>B</kb-key><kb-key>N</kb-key><kb-key>M</kb-key> - <kb-key class="backspace padded-right-special dark" char="" repeat>delete</kb-key> - </kb-row> - <kb-row> - <kb-key class="symbol dark" toKeyset="up:symbol" char="Invalid">?123</kb-key> - <kb-key class="mic dark" char="Mic"></kb-key> - <kb-key class="dark">,</kb-key> - <kb-key class="space dark" char=" "></kb-key> - <kb-key class="dark">.</kb-key> - <kb-key class="return dark" char="�A;">enter</kb-key> - </kb-row> - <kb-accent-container hidden> - <kb-accent-set id="E" offset=2> - <kb-accent-key>É</kb-accent-key> - <kb-accent-key>3</kb-accent-key> - <kb-accent-key class="active">E</kb-accent-key> - <kb-accent-key>È</kb-accent-key> - <kb-accent-key>Ê</kb-accent-key> - <kb-accent-key>Ë</kb-accent-key> - <kb-accent-key>Ē</kb-accent-key> - </kb-accent-set> - <kb-accent-set id="U" offset=3> - <kb-accent-key>Û</kb-accent-key> - <kb-accent-key>Ú</kb-accent-key> - <kb-accent-key>7</kb-accent-key> - <kb-accent-key class="active">U</kb-accent-key> - <kb-accent-key>Ù</kb-accent-key> - <kb-accent-key>Ü</kb-accent-key> - <kb-accent-key>Ū</kb-accent-key> - </kb-accent-set> - <kb-accent-set id="I" offset=4> - <kb-accent-key>Ï</kb-accent-key> - <kb-accent-key>Í</kb-accent-key> - <kb-accent-key>Ì</kb-accent-key> - <kb-accent-key>8</kb-accent-key> - <kb-accent-key class="active">I</kb-accent-key> - <kb-accent-key>Î</kb-accent-key> - <kb-accent-key>Ī</kb-accent-key> - </kb-accent-set> - <kb-accent-set id="O" offset=7> - <kb-accent-key>Œ</kb-accent-key> - <kb-accent-key>Ō</kb-accent-key> - <kb-accent-key>Ô</kb-accent-key> - <kb-accent-key>Ò</kb-accent-key> - <kb-accent-key>Ó</kb-accent-key> - <kb-accent-key>Õ</kb-accent-key> - <kb-accent-key>9</kb-accent-key> - <kb-accent-key class="active">O</kb-accent-key> - <kb-accent-key>Ö</kb-accent-key> - </kb-accent-set> - <kb-accent-set id="A" offset=0> - <kb-accent-key class="active">A</kb-accent-key> - <kb-accent-key>Á</kb-accent-key> - <kb-accent-key>À</kb-accent-key> - <kb-accent-key>Â</kb-accent-key> - <kb-accent-key>Ã</kb-accent-key> - <kb-accent-key>Ä</kb-accent-key> - <kb-accent-key>Å</kb-accent-key> - <kb-accent-key>Æ</kb-accent-key> - <kb-accent-key>Ā</kb-accent-key> - </kb-accent-set> - </kb-accent-container> - </kb-keyset> + <kb-row class="top"> + <kb-key>Q</kb-key><kb-key>W</kb-key><kb-key accents="E">E</kb-key><kb-key>R</kb-key> + <kb-key>T</kb-key><kb-key>Y</kb-key><kb-key accents="U">U</kb-key> + <kb-key accents="I">I</kb-key><kb-key accents="O">O</kb-key><kb-key>P</kb-key> + </kb-row> + <kb-row> + <div class="half-key-spacer"></div> + <kb-key accents="A">A</kb-key><kb-key>S</kb-key><kb-key>D</kb-key><kb-key>F</kb-key> + <kb-key>G</kb-key><kb-key>H</kb-key><kb-key>J</kb-key><kb-key>K</kb-key> + <kb-key>L</kb-key> + <div class="half-key-spacer"></div> + </kb-row> + <kb-row> + <kb-key class="left-shift padded-left-special dark" toKeyset="up:lower" char="Invalid">shift</kb-key> + <kb-key>Z</kb-key><kb-key>X</kb-key><kb-key>C</kb-key><kb-key>V</kb-key> + <kb-key>B</kb-key><kb-key>N</kb-key><kb-key>M</kb-key> + <kb-key class="backspace padded-right-special dark" char="" repeat>delete</kb-key> + </kb-row> + <kb-row> + <kb-key class="symbol dark" toKeyset="up:symbol" char="Invalid">?123</kb-key> + <kb-key class="mic dark" char="Mic"></kb-key> + <kb-key class="dark">,</kb-key> + <kb-key class="space dark" char=" "></kb-key> + <kb-key class="dark">.</kb-key> + <kb-key class="return dark" char="�A;">enter</kb-key> + </kb-row> + <kb-accent-container hidden> + <kb-accent-set id="E" offset=2> + <kb-accent-key>É</kb-accent-key> + <kb-accent-key>3</kb-accent-key> + <kb-accent-key class="active">E</kb-accent-key> + <kb-accent-key>È</kb-accent-key> + <kb-accent-key>Ê</kb-accent-key> + <kb-accent-key>Ë</kb-accent-key> + <kb-accent-key>Ē</kb-accent-key> + </kb-accent-set> + <kb-accent-set id="U" offset=3> + <kb-accent-key>Û</kb-accent-key> + <kb-accent-key>Ú</kb-accent-key> + <kb-accent-key>7</kb-accent-key> + <kb-accent-key class="active">U</kb-accent-key> + <kb-accent-key>Ù</kb-accent-key> + <kb-accent-key>Ü</kb-accent-key> + <kb-accent-key>Ū</kb-accent-key> + </kb-accent-set> + <kb-accent-set id="I" offset=4> + <kb-accent-key>Ï</kb-accent-key> + <kb-accent-key>Í</kb-accent-key> + <kb-accent-key>Ì</kb-accent-key> + <kb-accent-key>8</kb-accent-key> + <kb-accent-key class="active">I</kb-accent-key> + <kb-accent-key>Î</kb-accent-key> + <kb-accent-key>Ī</kb-accent-key> + </kb-accent-set> + <kb-accent-set id="O" offset=7> + <kb-accent-key>Œ</kb-accent-key> + <kb-accent-key>Ō</kb-accent-key> + <kb-accent-key>Ô</kb-accent-key> + <kb-accent-key>Ò</kb-accent-key> + <kb-accent-key>Ó</kb-accent-key> + <kb-accent-key>Õ</kb-accent-key> + <kb-accent-key>9</kb-accent-key> + <kb-accent-key class="active">O</kb-accent-key> + <kb-accent-key>Ö</kb-accent-key> + </kb-accent-set> + <kb-accent-set id="A" offset=0> + <kb-accent-key class="active">A</kb-accent-key> + <kb-accent-key>Á</kb-accent-key> + <kb-accent-key>À</kb-accent-key> + <kb-accent-key>Â</kb-accent-key> + <kb-accent-key>Ã</kb-accent-key> + <kb-accent-key>Ä</kb-accent-key> + <kb-accent-key>Å</kb-accent-key> + <kb-accent-key>Æ</kb-accent-key> + <kb-accent-key>Ā</kb-accent-key> + </kb-accent-set> + </kb-accent-container> + </kb-keyset> - <kb-keyset id="qwerty-lower"> - <kb-row class="top"> - <kb-key>q</kb-key><kb-key>w</kb-key><kb-key accents="e">e</kb-key><kb-key>r</kb-key> - <kb-key>t</kb-key><kb-key>y</kb-key><kb-key accents="u">u</kb-key> - <kb-key accents="i">i</kb-key><kb-key accents="o">o</kb-key><kb-key>p</kb-key> - </kb-row> + <kb-keyset id="qwerty-lower" isDefault=true> + <kb-row class="top"> + <kb-key>q</kb-key><kb-key>w</kb-key><kb-key accents="e">e</kb-key><kb-key>r</kb-key> + <kb-key>t</kb-key><kb-key>y</kb-key><kb-key accents="u">u</kb-key> + <kb-key accents="i">i</kb-key><kb-key accents="o">o</kb-key><kb-key>p</kb-key> + </kb-row> <kb-row> <div class="half-key-spacer"></div> <kb-key accents="a">a</kb-key><kb-key>s</kb-key><kb-key>d</kb-key><kb-key>f</kb-key> diff --git a/ui/keyboard/resources/webui_index.html b/ui/keyboard/resources/webui_index.html new file mode 100644 index 0000000..47e1378 --- /dev/null +++ b/ui/keyboard/resources/webui_index.html @@ -0,0 +1,39 @@ +<!DOCTYPE HTML> +<!-- + -- Copyright 2013 The Chromium Authors. All rights reserved. + -- Use of this source code is governed by a BSD-style license that can be + -- found in the LICENSE file. + --> + +<!-- + -- To avoid unintentionally break webui keyboard when changing extension + -- keyboard, creates this file and uses it as index.html for webui keyboard. + -- TODO(bshe): remove this file when dynamic layout loading is fixed + -- (http://www.crbug.com/260278). + --> + +<html> + <head> + <meta charset="UTF-8"> + <link rel="stylesheet" href="main.css"> + <script src="constants.js"></script> + <script src="polymer.min.js"></script> + <script src="api_adapter.js"></script> + <script src="voice_input.js"></script> + <link rel="import" href="elements/kb-accent-container.html"> + <link rel="import" href="elements/kb-accent-set.html"> + <link rel="import" href="elements/kb-accent-key.html"> + <link rel="import" href="elements/kb-key-base.html"> + <link rel="import" href="elements/kb-key.html"> + <link rel="import" href="elements/kb-keyboard.html"> + <link rel="import" href="elements/kb-keyset.html"> + <link rel="import" href="elements/kb-row.html"> + <link id="qwerty" rel="import" href="layouts/qwerty.html"> + <!--TODO(stevet): Import 'Open Sans' font. --> + <script src="main.js"></script> + </head> + <body> + <kb-keyboard id="keyboard" touch-action="none" layout="qwerty"> + </kb-keyboard> + </body> +</html> |