From 7c1660b4d76ec57993b0f0c48af20a2c45916805 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 15 Jul 2011 15:36:32 -0700
Subject: [PATCH] Bring "comma" key back to symbol layout

Bug: 5035197
Change-Id: Ia931305b9dd2ee9eb51deef6b2477fbf351ac479
---
 java/res/xml/kbd_key_styles.xml   | 15 +++++++++------
 java/res/xml/kbd_symbols_row4.xml |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index aa1a00527..9791001da 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -227,6 +227,14 @@
                 latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>
+    <key-style
+        latin:styleName="basePunctuationKeyStyle"
+        latin:keyLabel="."
+        latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
+        latin:keyLabelOption="hasPopupHint"
+        latin:popupCharacters="@string/alternates_for_punctuation"
+        latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
+        latin:parentStyle="functionalKeyStyle" />
     <switch>
         <case
             latin:navigateAction="true"
@@ -242,12 +250,7 @@
         <default>
             <key-style
                 latin:styleName="punctuationKeyStyle"
-                latin:keyLabel="."
-                latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
-                latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_punctuation"
-                latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:parentStyle="basePunctuationKeyStyle" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/kbd_symbols_row4.xml
index 34c06df04..24313acb5 100644
--- a/java/res/xml/kbd_symbols_row4.xml
+++ b/java/res/xml/kbd_symbols_row4.xml
@@ -42,7 +42,7 @@
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
                 <Key
-                    latin:keyStyle="punctuationKeyStyle"
+                    latin:keyStyle="basePunctuationKeyStyle"
                     latin:keyWidth="9.2%p" />
             </case>
             <!-- latin:hasSettingsKey="false" -->
@@ -57,7 +57,7 @@
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
                 <Key
-                    latin:keyStyle="punctuationKeyStyle" />
+                    latin:keyStyle="basePunctuationKeyStyle" />
             </default>
         </switch>
         <switch>