Make some additional adjustments to the v1 keyboard layout.

Move the mic key to the capslock location.
Remove the '@' key in favour of a second symbol key.
Adjust the sizing of the space key.

BUG=248226

Review URL: https://chromiumcodereview.appspot.com/16943012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207958 0039d316-1c4b-4281-b951-d872f2087c98

ui/keyboard/resources/keysets.html

@@ -14,7 +14,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="left">#123</kb-key>
+      <kb-key class="mic dark" char="Mic"></kb-key>
       <kb-key>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>
@@ -28,10 +28,10 @@
       <kb-key class="right-shift dark" toKeyset="lower" char="Invalid" align="right">shift</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
-      <kb-key class="dotcom dark">.com</kb-key>
+      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="left">#123</kb-key>
+      <kb-key class="dotcom dark" align="left">.com</kb-key>
       <kb-key char=" " class="space dark" toKeyset="upper"></kb-key>
-      <kb-key class="dark">@</kb-key>
+      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="right">#123</kb-key>
       <kb-key class="hide dark"></kb-key>
     </kb-row>
   </kb-keyset>
@@ -45,7 +45,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="left">#123</kb-key>
+      <kb-key class="mic dark" char="Mic"></kb-key>
       <kb-key>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>
@@ -59,10 +59,10 @@
       <kb-key class="right-shift dark" toKeyset="upper" char="Invalid" align="right">shift</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
-      <kb-key class="dotcom dark">.com</kb-key>
+      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="left">#123</kb-key>
+      <kb-key class="dotcom dark" align="left">.com</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
-      <kb-key class="dark">@</kb-key>
+      <kb-key class="symbol dark" toKeyset="symbol" char="Invalid" align="right">#123</kb-key>
       <kb-key class="hide dark"></kb-key>
     </kb-row>
   </kb-keyset>
@@ -76,7 +76,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="left">abc</kb-key>
+      <kb-key class="mic dark" char="Mic"></kb-key>
       <kb-key>@</kb-key><kb-key>#</kb-key><kb-key>$</kb-key><kb-key>%</kb-key>
       <kb-key>&</kb-key><kb-key>*</kb-key><kb-key>/</kb-key><kb-key>(</kb-key>
       <kb-key>)</kb-key>
@@ -90,10 +90,10 @@
       <kb-key class="right-more dark" toKeyset="more" char="Invalid" align="right">more</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
-      <kb-key class="dotcom dark">.com</kb-key>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="left">abc</kb-key>
+      <kb-key class="dotcom dark" align="left">.com</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
-      <kb-key class="dark">@</kb-key>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="right">abc</kb-key>
       <kb-key class="hide dark"></kb-key>
     </kb-row>
   </kb-keyset>
@@ -107,7 +107,7 @@
       <kb-key class="backspace dark" char="&#x0008;" repeat align="right">backspace</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="left">abc</kb-key>
+      <kb-key class="mic dark" char="Mic"></kb-key>
       <kb-key>&#x00A3</kb-key><kb-key>&#x00A2</kb-key><kb-key>&#x20AC</kb-key><kb-key>&#x2122</kb-key>
       <kb-key>&#x00A9</kb-key><kb-key>&#x00AE</kb-key><kb-key>\</kb-key><kb-key>[</kb-key>
       <kb-key>]</kb-key>
@@ -121,10 +121,10 @@
       <kb-key class="right-more dark" toKeyset="symbol" char="Invalid" align="right">#123</kb-key>
     </kb-row>
     <kb-row>
-      <kb-key class="mic dark" char="Mic"></kb-key>
-      <kb-key class="dotcom dark">.com</kb-key>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="left">abc</kb-key>
+      <kb-key class="dotcom dark" align="left">.com</kb-key>
       <kb-key class="space dark" char=" "></kb-key>
-      <kb-key class="dark">@</kb-key>
+      <kb-key class="symbol dark" toKeyset="lower" char="Invalid" align="right">abc</kb-key>
       <kb-key class="hide dark"></kb-key>
     </kb-row>
   </kb-keyset>

ui/keyboard/resources/main.css

@@ -50,8 +50,6 @@ kb-key.dark {
 .at,
 .com,
 .comma,
-.hide,
-.mic,
 .period,
 .tab {
   -webkit-box-flex: 1.3 !important;
@@ -61,10 +59,14 @@ kb-key.dark {
   -webkit-box-flex: 2.1 !important;
 }
 
-.symbol {
+.mic {
   -webkit-box-flex: 1.5 !important;
 }
 
+.symbol {
+  -webkit-box-flex: 1.25 !important;
+}
+
 .backspace {
   -webkit-box-flex: 1.7 !important;
 }
@@ -80,7 +82,7 @@ kb-key.dark {
 }
 
 .space {
-  -webkit-box-flex: 4.8 !important;
+  -webkit-box-flex: 6.0 !important;
 }
 
 .bar {