nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 18ac3c8a: am 16a43d2b: Let the backing view cover the entire content area

Browse source 
* commit '18ac3c8afd06c237a2935abad130aa3b99b5004b':
  Let the backing view cover the entire content area
This commit is contained in:
Yohei Yukawa 2014-08-16 14:02:21 +00:00 committed by Android Git Automerger
commit c9240d280c
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1089,7 +1089,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
- keyboardHeight; - keyboardHeight;
final LayoutParams params = mKeyPreviewBackingView.getLayoutParams(); 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); mKeyPreviewBackingView.setLayoutParams(params);
return params.height; return params.height;
} }

6
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
View file

@ -167,16 +167,14 @@ final class SuggestionStripLayoutHelper {
return mMaxMoreSuggestionsRow * mMoreSuggestionsRowHeight + mMoreSuggestionsBottomGap; return mMaxMoreSuggestionsRow * mMoreSuggestionsRowHeight + mMoreSuggestionsBottomGap;
} }
public int setMoreSuggestionsHeight(final int remainingHeight) { public void setMoreSuggestionsHeight(final int remainingHeight) {
final int currentHeight = getMoreSuggestionsHeight(); final int currentHeight = getMoreSuggestionsHeight();
if (currentHeight <= remainingHeight) { if (currentHeight <= remainingHeight) {
return currentHeight; return;
} }
mMaxMoreSuggestionsRow = (remainingHeight - mMoreSuggestionsBottomGap) mMaxMoreSuggestionsRow = (remainingHeight - mMoreSuggestionsBottomGap)
/ mMoreSuggestionsRowHeight; / mMoreSuggestionsRowHeight;
final int newHeight = getMoreSuggestionsHeight();
return newHeight;
} }
private static Drawable getMoreSuggestionsHint(final Resources res, final float textSize, private static Drawable getMoreSuggestionsHint(final Resources res, final float textSize,

4
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View file

@ -219,8 +219,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mStripVisibilityGroup.showSuggestionsStrip(); mStripVisibilityGroup.showSuggestionsStrip();
} }
public int setMoreSuggestionsHeight(final int remainingHeight) { public void setMoreSuggestionsHeight(final int remainingHeight) {
return mLayoutHelper.setMoreSuggestionsHeight(remainingHeight); mLayoutHelper.setMoreSuggestionsHeight(remainingHeight);
} }
public boolean isShowingAddToDictionaryHint() { public boolean isShowingAddToDictionaryHint() {