commit 39004972b145065bf52e32d1d1cb361f96ed4501
author Ken Wakasa <kwakasa@google.com> Tue Oct 12 03:15:36 2010 +0900
committer Ken Wakasa <kwakasa@google.com> Tue Oct 12 03:15:36 2010 +0900
tree 485c9ff27c3661888dde6c4543eebb8055451c9d
parent 3de6ba6ab9713db4b617e46fa8daa559a816fdea
parent fd64e47c2b00a6ac7eb73a6a6601d9248bad6b84

resolved conflicts for merge of fd64e47c to master

Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085

java/res/xml/kbd_qwerty.xml

diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 1495bae..c14c7fa 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -70,7 +70,7 @@
         <Key
             latin:keyLabel="o"
             latin:keyHintIcon="@drawable/keyboard_hint_9"
-            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupKeyboard="@xml/kbd_popup_narrow_template"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"