diff options
author | 2011-01-24 17:38:49 +0900 | |
---|---|---|
committer | 2011-01-24 19:29:27 +0900 | |
commit | 8cacb024cf400241f9885cccee782c286cbf1330 (patch) | |
tree | 2a1df007e4b78fb30edeab666ed618f7cf4657f2 /java/src/com/android/inputmethod/voice/VoiceIMEConnector.java | |
parent | 47e482157e3394c680e5b8a1a4d023b242cd307d (diff) | |
download | latinime-8cacb024cf400241f9885cccee782c286cbf1330.tar.gz latinime-8cacb024cf400241f9885cccee782c286cbf1330.tar.xz latinime-8cacb024cf400241f9885cccee782c286cbf1330.zip |
Set minimum height for RecognitionView in the case that there is no keyboard view loaded.
Bug: 3352322
Change-Id: I9a7b2a745b47bdc62a96a5cd2c0d8ad717e1b406
Diffstat (limited to 'java/src/com/android/inputmethod/voice/VoiceIMEConnector.java')
-rw-r--r-- | java/src/com/android/inputmethod/voice/VoiceIMEConnector.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java index 6c9b7d527..a3a3ea88e 100644 --- a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java +++ b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java @@ -78,6 +78,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { // given text field. For instance this is specified by the search dialog when the // dialog is already showing a voice search button. private static final String IME_OPTION_NO_MICROPHONE = "nm"; + private static final int RECOGNITIONVIEW_HEIGHT_THRESHOLD_RATIO = 6; @SuppressWarnings("unused") private static final String TAG = "VoiceIMEConnector"; @@ -543,10 +544,14 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { // As we add mm, we don't know how the rounding is going to work // thus we may end up with few pixels extra (or less). if (keyboardView != null) { - int h = keyboardView.getHeight(); - if (h > 0) { - View popupLayout = v.findViewById(R.id.popup_layout); - popupLayout.getLayoutParams().height = h; + View popupLayout = v.findViewById(R.id.popup_layout); + final int displayHeight = + mService.getResources().getDisplayMetrics().heightPixels; + final int currentHeight = popupLayout.getLayoutParams().height; + final int keyboardHeight = keyboardView.getHeight(); + if (keyboardHeight > currentHeight || keyboardHeight + > (displayHeight / RECOGNITIONVIEW_HEIGHT_THRESHOLD_RATIO)) { + popupLayout.getLayoutParams().height = keyboardHeight; } } mService.setInputView(v); |