am c66a7278: Merge "Revert "Use "..." instead of "\u2026"""

* commit 'c66a7278d2e5f475c8b7f1638d1569b7b8b06662':
  Revert "Use "..." instead of "\u2026""
This commit is contained in:
Fabrice Di Meglio 2011-09-23 15:09:51 -07:00 committed by Android Git Automerger
commit 856ca13637
2 changed files with 3 additions and 3 deletions

View file

@ -84,7 +84,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
private final float mBackgroundDimAmount; private final float mBackgroundDimAmount;
// HORIZONTAL ELLIPSIS "...", character for popup hint. // HORIZONTAL ELLIPSIS "...", character for popup hint.
private static final String POPUP_HINT_CHAR = "..."; private static final String POPUP_HINT_CHAR = "\u2026";
// Margin between the label and the icon on a key that has both of them. // Margin between the label and the icon on a key that has both of them.
// Specified by the fraction of the key width. // Specified by the fraction of the key width.

View file

@ -155,7 +155,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
private final float mCenterSuggestionWeight; private final float mCenterSuggestionWeight;
private final int mCenterSuggestionIndex; private final int mCenterSuggestionIndex;
private final Drawable mMoreSuggestionsHint; private final Drawable mMoreSuggestionsHint;
private static final String MORE_SUGGESTIONS_HINT = "..."; private static final String MORE_SUGGESTIONS_HINT = "\u2026";
private static final CharacterStyle BOLD_SPAN = new StyleSpan(Typeface.BOLD); private static final CharacterStyle BOLD_SPAN = new StyleSpan(Typeface.BOLD);
private static final CharacterStyle UNDERLINE_SPAN = new UnderlineSpan(); private static final CharacterStyle UNDERLINE_SPAN = new UnderlineSpan();
@ -237,7 +237,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
paint.setTextSize(textSize); paint.setTextSize(textSize);
paint.setColor(color); paint.setColor(color);
final Rect bounds = new Rect(); final Rect bounds = new Rect();
paint.getTextBounds(MORE_SUGGESTIONS_HINT, 0, MORE_SUGGESTIONS_HINT.length(), bounds); paint.getTextBounds(MORE_SUGGESTIONS_HINT, 0, 1, bounds);
final int width = Math.round(bounds.width() + 0.5f); final int width = Math.round(bounds.width() + 0.5f);
final int height = Math.round(bounds.height() + 0.5f); final int height = Math.round(bounds.height() + 0.5f);
final Bitmap buffer = Bitmap.createBitmap( final Bitmap buffer = Bitmap.createBitmap(