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

Merge "Fix more suggestions text width calculation" into jb-mr1-dev

main
Tadashi G. Takaoka 2012-10-16 17:24:31 -07:00 committed by Android (Google) Code Review
parent 0cbc19b0b1 bdc8b9e42b
commit c0bc336955
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -105,7 +105,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
private static final String TAG = KeyboardView.class.getSimpleName(); private static final String TAG = KeyboardView.class.getSimpleName();
// XML attributes // XML attributes
private final KeyVisualAttributes mKeyVisualAttributes; protected final KeyVisualAttributes mKeyVisualAttributes;
private final int mKeyLabelHorizontalPadding; private final int mKeyLabelHorizontalPadding;
private final float mKeyHintLetterPadding; private final float mKeyHintLetterPadding;
private final float mKeyPopupHintLetterPadding; private final float mKeyPopupHintLetterPadding;
@ -733,6 +733,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
return width; return width;
} }
// TODO: Remove this method.
public float getLabelWidth(final String label, final Paint paint) { public float getLabelWidth(final String label, final Paint paint) {
paint.getTextBounds(label, 0, label.length(), mTextBounds); paint.getTextBounds(label, 0, label.length(), mTextBounds);
return mTextBounds.width(); return mTextBounds.width();

4
java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java
View File

@ -51,10 +51,11 @@ public final class MoreSuggestions extends Keyboard {
super(); super();
} }
// TODO: Remove {@link MoreSuggestionsView} argument.
public int layout(final SuggestedWords suggestions, final int fromPos, final int maxWidth, public int layout(final SuggestedWords suggestions, final int fromPos, final int maxWidth,
final int minWidth, final int maxRow, final MoreSuggestionsView view) { final int minWidth, final int maxRow, final MoreSuggestionsView view) {
clearKeys(); clearKeys();
final Resources res = view.getContext().getResources(); final Resources res = view.getResources();
mDivider = res.getDrawable(R.drawable.more_suggestions_divider); mDivider = res.getDrawable(R.drawable.more_suggestions_divider);
mDividerWidth = mDivider.getIntrinsicWidth(); mDividerWidth = mDivider.getIntrinsicWidth();
final int padding = (int) res.getDimension( final int padding = (int) res.getDimension(
@ -181,6 +182,7 @@ public final class MoreSuggestions extends Keyboard {
load(xmlId, keyboard.mId); load(xmlId, keyboard.mId);
mParams.mVerticalGap = mParams.mTopPadding = keyboard.mVerticalGap / 2; mParams.mVerticalGap = mParams.mTopPadding = keyboard.mVerticalGap / 2;
mPaneView.updateKeyboardGeometry(mParams.mDefaultRowHeight);
final int count = mParams.layout(suggestions, fromPos, maxWidth, minWidth, maxRow, final int count = mParams.layout(suggestions, fromPos, maxWidth, minWidth, maxRow,
mPaneView); mPaneView);
mFromPos = fromPos; mFromPos = fromPos;

4
java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java
View File

@ -105,6 +105,10 @@ public final class MoreSuggestionsView extends KeyboardView implements MoreKeysP
} }
} }
public void updateKeyboardGeometry(final int keyHeight) {
mKeyDrawParams.updateParams(keyHeight, mKeyVisualAttributes);
}
@Override @Override
public void setKeyboard(Keyboard keyboard) { public void setKeyboard(Keyboard keyboard) {
super.setKeyboard(keyboard); super.setKeyboard(keyboard);