aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-08-16 12:28:13 +0900
committerYohei Yukawa <yukawa@google.com>2014-08-16 12:28:13 +0900
commit16a43d2bd9c5d80f8e50f5a7682b657ee10621e1 (patch)
treef819e431270a12e8d66506a82d8963db1bb6ffb7 /java/src/com/android/inputmethod/latin
parentb8d764772b174cbd37354ffd0009bda56f223dc4 (diff)
downloadlatinime-16a43d2bd9c5d80f8e50f5a7682b657ee10621e1.tar.gz
latinime-16a43d2bd9c5d80f8e50f5a7682b657ee10621e1.tar.xz
latinime-16a43d2bd9c5d80f8e50f5a7682b657ee10621e1.zip
Let the backing view cover the entire content area
With this CL, the backing view starts covering the content area entirely. This allows the IME to render its UI elements at an arbitrary position on the screen. Change-Id: I8b4173410931b776964dddf66de2fe247e51d9de
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
-rw-r--r--java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java6
-rw-r--r--java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java4
3 files changed, 8 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 71fd10e83..258f21f7c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1089,7 +1089,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
- keyboardHeight;
final LayoutParams params = mKeyPreviewBackingView.getLayoutParams();
- params.height = mSuggestionStripView.setMoreSuggestionsHeight(remainingHeight);
+ mSuggestionStripView.setMoreSuggestionsHeight(remainingHeight);
+
+ // Let the backing cover the remaining region entirely.
+ params.height = remainingHeight;
mKeyPreviewBackingView.setLayoutParams(params);
return params.height;
}
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
index c5f062d5b..7307ca1ba 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
@@ -167,16 +167,14 @@ final class SuggestionStripLayoutHelper {
return mMaxMoreSuggestionsRow * mMoreSuggestionsRowHeight + mMoreSuggestionsBottomGap;
}
- public int setMoreSuggestionsHeight(final int remainingHeight) {
+ public void setMoreSuggestionsHeight(final int remainingHeight) {
final int currentHeight = getMoreSuggestionsHeight();
if (currentHeight <= remainingHeight) {
- return currentHeight;
+ return;
}
mMaxMoreSuggestionsRow = (remainingHeight - mMoreSuggestionsBottomGap)
/ mMoreSuggestionsRowHeight;
- final int newHeight = getMoreSuggestionsHeight();
- return newHeight;
}
private static Drawable getMoreSuggestionsHint(final Resources res, final float textSize,
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index 6c4d80ecb..9b8c38a2d 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -219,8 +219,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mStripVisibilityGroup.showSuggestionsStrip();
}
- public int setMoreSuggestionsHeight(final int remainingHeight) {
- return mLayoutHelper.setMoreSuggestionsHeight(remainingHeight);
+ public void setMoreSuggestionsHeight(final int remainingHeight) {
+ mLayoutHelper.setMoreSuggestionsHeight(remainingHeight);
}
public boolean isShowingAddToDictionaryHint() {