commit bdd79917f0b229d92551a7ada15ef1bd7beaeb95
author Tadashi G. Takaoka <takaoka@google.com> Wed Mar 19 17:26:17 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Mar 19 19:37:27 2014 +0900
tree 107ac9e520f999cf97e6af25ad5190d78bdb4284
parent 0dabae720a83f9099667dea4de002007fdf35d60

Fix PC Qwerty layout

This CL fixes:
 - Action label never displayed on phone.
 - Go action label incorrectly showed on tablet.
 - Broken layout on noMicrophoneKey+noSettingsKey input field.
 - "Voice input key" settings has no effect on phone.
 - Inconsistent microphone and emoji key layouts.
 - Slightly modified spacebar size when language switch key is on.
 - Slightly larger enter key on tablet.

Bug: 13537661
Change-Id: I69a6ee7bc99e84b104a4d0352e1824096f6a4750

java/res/xml-sw600dp/row_pcqwerty5.xml

diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
index b854f10..52b581a 100644
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/java/res/xml-sw600dp/row_pcqwerty5.xml
@@ -24,37 +24,32 @@
     <Row
         latin:keyWidth="7.0%p"
     >
+        <include
+            latin:keyWidth="9.0%p"
+            latin:keyboardLayout="@xml/key_shortcut" />
         <switch>
             <case
                 latin:languageSwitchKeyEnabled="true"
             >
                 <Key
                     latin:keyStyle="languageSwitchKeyStyle"
-                    latin:keyWidth="9.0%p"
-                    latin:backgroundType="functional" />
+                    latin:keyXPos="22.0%p"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="spaceKeyStyle"
+                    latin:keyWidth="40.0%p" />
             </case>
-        </switch>
-        <Key
-            latin:keyStyle="spaceKeyStyle"
-            latin:keyXPos="25.5%p"
-            latin:keyWidth="49.0%p" />
-        <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
-            >
-                <include
-                    latin:keyXPos="-9.0%p"
-                    latin:keyWidth="9.0%p"
-                    latin:keyboardLayout="@xml/key_shortcut" />
-            </case>
-            <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
             <default>
-                <include
-                    latin:keyXPos="-9.0%p"
-                    latin:keyWidth="9.0%p"
-                    latin:backgroundType="functional"
-                    latin:keyboardLayout="@xml/key_f2" />
+                <Key
+                    latin:keyStyle="spaceKeyStyle"
+                    latin:keyXPos="29.0%p"
+                    latin:keyWidth="42.0%p" />
             </default>
         </switch>
+        <include
+            latin:keyXPos="-9.0%p"
+            latin:keyWidth="9.0%p"
+            latin:backgroundType="functional"
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>