aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-04 07:30:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 07:30:18 +0000
commitc133c35607a0418593c1be66a5a369bc5d3ddf3f (patch)
tree7b30f6ca1e7e95c10603372492cc155017751cfc /java/src/com/android/inputmethod/latin
parent7824b0fd2b01dda3b5f84ae985cc71bd35e55c8f (diff)
parentb9ba5fc778468c200727f77163ef81e378b5b70e (diff)
downloadlatinime-c133c35607a0418593c1be66a5a369bc5d3ddf3f.tar.gz
latinime-c133c35607a0418593c1be66a5a369bc5d3ddf3f.tar.xz
latinime-c133c35607a0418593c1be66a5a369bc5d3ddf3f.zip
am b9ba5fc7: Merge "Fix MainKeyboardView visibility must be aligned with main keyboard frame"
* commit 'b9ba5fc778468c200727f77163ef81e378b5b70e': Fix MainKeyboardView visibility must be aligned with main keyboard frame
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index cd09bf6c7..c86d2b849 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1194,7 +1194,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (hasHardwareKeyboard && visibleKeyboardView.getVisibility() == View.GONE) {
// If there is a hardware keyboard and a visible software keyboard view has been hidden,
// no visual element will be shown on the screen.
- outInsets.touchableInsets = inputHeight;
+ outInsets.contentTopInsets = inputHeight;
outInsets.visibleTopInsets = inputHeight;
mInsetsUpdater.setInsets(outInsets);
return;
@@ -1204,7 +1204,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
? mSuggestionStripView.getHeight() : 0;
final int visibleTopY = inputHeight - visibleKeyboardView.getHeight() - suggestionsHeight;
mSuggestionStripView.setMoreSuggestionsHeight(visibleTopY);
- // Need to set touchable region only if a keyboard view is being shown.
+ // Need to set expanded touchable region only if a keyboard view is being shown.
if (visibleKeyboardView.isShown()) {
final int touchLeft = 0;
final int touchTop = mKeyboardSwitcher.isShowingMoreKeysPanel() ? 0 : visibleTopY;