resolved conflicts for merge of ac777128 to master

Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index e036cd6..dc88e2b 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -41,6 +41,7 @@
         <Key
             latin:keyLabel="-"
             latin:keyWidth="20%p"
+            latin:isModifier="true"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
@@ -57,6 +58,7 @@
         <Key
             latin:keyLabel="."
             latin:keyWidth="20%p"
+            latin:isModifier="true"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
@@ -75,6 +77,7 @@
             latin:keyIcon="@drawable/sym_keyboard_delete"
             latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
             latin:keyWidth="20%p"
+            latin:isModifier="true"
             latin:isRepeatable="true"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -84,7 +87,8 @@
         <Key
             latin:codes="@integer/key_symbol"
             latin:keyIcon="@drawable/sym_keyboard_numalt"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
+            latin:iconPreview="@drawable/sym_keyboard_feedback_numalt"
+            latin:keyEdgeFlags="left" />
         <Key
             latin:codes="48"
             latin:keyIcon="@drawable/sym_keyboard_num0" />
@@ -96,6 +100,7 @@
             latin:codes="@integer/key_return"
             latin:keyIcon="@drawable/sym_keyboard_return"
             latin:keyWidth="20%p"
+            latin:isModifier="true"
             latin:keyEdgeFlags="right" />
     </Row>
 </Keyboard>