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:02:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 04:02:12 -0700
commitc0fc4bf9932caf536af5d5d86bb61ec6d8a44a99 (patch)
tree15d65a1cfd92b17c5c37c4959898593d37f93b79 /java/src/com/android/inputmethod/latin/LatinKeyboard.java
parentbd677880494f30d58913f1bac612a32410e6465b (diff)
parent8e1f1be0f3cfce4ed0623d3d137f53f034f5b718 (diff)
downloadlatinime-c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99.tar.gz
latinime-c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99.tar.xz
latinime-c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99.zip
am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718' into gingerbread-plus-aosp * commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718': 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 14a503bc3..43d0a7beb 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -367,11 +367,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;
}
}