DO NOT MERGE. Follow up change to I8b38e280
Add visual indicator that long press / or @ on F1 key will bring up Settings
bug: 3084022
Change-Id: If925b546829ca8e8806e1f8f89eaf72fc8c220da
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 6e2e692..70eab09 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -209,7 +209,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -241,7 +241,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -385,7 +385,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -422,7 +422,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index 36656ed..021f991 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -202,7 +202,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -229,7 +229,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -350,7 +350,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -381,7 +381,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index e74f137..c28ec5e 100644
--- a/java/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
@@ -188,7 +188,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -220,7 +220,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -364,7 +364,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -401,7 +401,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index bded3e3..aca06ea 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -189,7 +189,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -221,7 +221,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -365,7 +365,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -402,7 +402,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index 679d940..53eddaa 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -182,7 +182,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -209,7 +209,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -330,7 +330,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -361,7 +361,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index 0ad2ca3..b652b82 100644
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -147,7 +147,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -179,7 +179,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -323,7 +323,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -360,7 +360,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 10ca0fc..f191133 100644
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -140,7 +140,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -167,7 +167,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -288,7 +288,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -319,7 +319,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 8377bbf..632ee6d 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -209,7 +209,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -241,7 +241,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -385,7 +385,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -422,7 +422,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index ab14984..67d8750 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -202,7 +202,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -229,7 +229,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -350,7 +350,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -381,7 +381,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index d40ccef..ed44e76 100644
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -187,7 +187,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -219,7 +219,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -363,7 +363,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -400,7 +400,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index cc71b08..62ce7d6 100644
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -180,7 +180,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -207,7 +207,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -328,7 +328,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -359,7 +359,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index 835f8c1..e3279dc 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -180,7 +180,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -212,7 +212,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -356,7 +356,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -393,7 +393,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index 76a9e55..b485360 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -173,7 +173,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -200,7 +200,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -321,7 +321,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -352,7 +352,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index f88bd3c..f8a7e94 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -210,7 +210,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -242,7 +242,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -386,7 +386,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -423,7 +423,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index 8493237..0141c2b 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -204,7 +204,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -231,7 +231,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -352,7 +352,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -383,7 +383,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index a2c9b2b..d5090b3 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -186,7 +186,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -217,7 +217,7 @@
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -357,7 +357,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="/"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -393,7 +393,7 @@
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
- android:keyLabel="\@"
+ android:codes="@integer/key_f1"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index d9943a9..c5de4d4 100644
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -179,7 +179,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -205,7 +205,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -322,7 +322,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="/" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -352,7 +352,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:keyLabel="\@" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml/popup_at.xml b/java/res/xml/popup_at.xml
new file mode 100644
index 0000000..197eea4
--- /dev/null
+++ b/java/res/xml/popup_at.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:keyWidth="10%p"
+ android:horizontalGap="0px"
+ android:verticalGap="0px"
+ android:keyHeight="@dimen/popup_key_height"
+>
+ <Row
+ android:rowEdgeFlags="top|bottom"
+ >
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="\@"
+ android:keyEdgeFlags="right" />
+ </Row>
+</Keyboard>
diff --git a/java/res/xml/popup_slash.xml b/java/res/xml/popup_slash.xml
new file mode 100644
index 0000000..a38fde0
--- /dev/null
+++ b/java/res/xml/popup_slash.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:keyWidth="10%p"
+ android:horizontalGap="0px"
+ android:verticalGap="0px"
+ android:keyHeight="@dimen/popup_key_height"
+>
+ <Row
+ android:rowEdgeFlags="top|bottom"
+ >
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="/"
+ android:keyEdgeFlags="right" />
+ </Row>
+</Keyboard>