From 494926fc2bad8d0ce1e73f02ff485f0d1c87b957 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 7 Apr 2011 17:49:49 +0900
Subject: [PATCH] Remove "settings key" popup from "comma key"

Bug: 4196879
Change-Id: I119528c03526b47a1398d9efc2aa307eb0c07ffe
---
 java/res/xml/kbd_qwerty_f1.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml
index cbdb8c09a..6bb96c0a0 100644
--- a/java/res/xml/kbd_qwerty_f1.xml
+++ b/java/res/xml/kbd_qwerty_f1.xml
@@ -51,11 +51,24 @@
                 <case
                     latin:hasVoiceKey="false"
                 >
-                    <Key
-                        latin:keyLabel=","
-                        latin:keyHintIcon="@drawable/hint_popup"
-                        latin:popupCharacters="@string/alternates_for_settings_comma"
-                        latin:isModifier="true" />
+                    <switch>
+                        <case
+                            latin:hasSettingsKey="true"
+                        >
+                            <Key
+                                latin:keyLabel=","
+                                latin:isModifier="true" />
+                        </case>
+                        <case
+                            latin:hasSettingsKey="false"
+                        >
+                            <Key
+                                latin:keyLabel=","
+                                latin:keyHintIcon="@drawable/hint_popup"
+                                latin:popupCharacters="@string/alternates_for_settings_comma"
+                                latin:isModifier="true" />
+                        </case>
+                    </switch>
                 </case>
             </switch>
         </default>