aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinKeyboard.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-10-01 04:04:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 04:04:38 -0700
commit932a1b756d5e7e350dfb3c937a43632426f834c2 (patch)
treecfce7e920fd963b1d88057f327d83933945a3266 /java/src/com/android/inputmethod/latin/LatinKeyboard.java
parentd778ff20e7e0059e7ef8df4337569c12dcb198b6 (diff)
parentc0fc4bf9932caf536af5d5d86bb61ec6d8a44a99 (diff)
downloadlatinime-932a1b756d5e7e350dfb3c937a43632426f834c2.tar.gz
latinime-932a1b756d5e7e350dfb3c937a43632426f834c2.tar.xz
latinime-932a1b756d5e7e350dfb3c937a43632426f834c2.zip
am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99' * commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99': Long press mic/comma key bring mini keyboard with settings
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboard.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboard.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 76b90f8f3..31394d1cc 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -375,11 +375,13 @@ public class LatinKeyboard extends Keyboard {
mF1Key.label = null;
mF1Key.icon = mMicIcon;
mF1Key.iconPreview = mMicPreviewIcon;
+ mF1Key.popupResId = R.xml.popup_mic;
} else {
mF1Key.label = ",";
mF1Key.codes = new int[] { ',' };
mF1Key.icon = null;
mF1Key.iconPreview = null;
+ mF1Key.popupResId = R.xml.popup_comma;
}
}