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

am 344a7fef: am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev 

* commit '344a7fef5bd101e2d1c4278cc35de2862f28a456':
  Fix more suggestions text width calculation
main
Tadashi G. Takaoka 2012-10-16 17:32:00 -07:00 committed by Android Git Automerger
parent 477088c612 344a7fef5b
commit 788c885aa5
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();
// XML attributes
private final KeyVisualAttributes mKeyVisualAttributes;
protected final KeyVisualAttributes mKeyVisualAttributes;
private final int mKeyLabelHorizontalPadding;
private final float mKeyHintLetterPadding;
private final float mKeyPopupHintLetterPadding;
@ -733,6 +733,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
return width;
}
// TODO: Remove this method.
public float getLabelWidth(final String label, final Paint paint) {
paint.getTextBounds(label, 0, label.length(), mTextBounds);
return mTextBounds.width();

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

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

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

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