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

am 67394a39: Preparatory small clean up for bug: 5776979 

* commit '67394a394f325e948cde8aaeb2bce0fa0936b5a2':
  Preparatory small clean up for bug: 5776979
main
Ken Wakasa 2011-12-17 05:36:44 -08:00 committed by Android Git Automerger
parent b864d07e27 67394a394f
commit 32f45ed31c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
View File

@ -280,9 +280,13 @@ public class LatinKeyboard extends Keyboard {
final int textStyle; final int textStyle;
final int defaultTextSize; final int defaultTextSize;
if (MEDIUM_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR.equals(textSizeOfLanguageOnSpacebar)) { if (MEDIUM_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR.equals(textSizeOfLanguageOnSpacebar)) {
// TODO: TextAppearance_Medium depends on the current system wide font size
// settings. Probably should stop using this.
textStyle = android.R.style.TextAppearance_Medium; textStyle = android.R.style.TextAppearance_Medium;
defaultTextSize = 18; defaultTextSize = 18;
} else { } else {
// TODO: TextAppearance_Small depends on the current system wide font size
// settings. Probably should stop using this.
textStyle = android.R.style.TextAppearance_Small; textStyle = android.R.style.TextAppearance_Small;
defaultTextSize = 14; defaultTextSize = 14;
} }
@ -331,7 +335,9 @@ public class LatinKeyboard extends Keyboard {
private static final int[] ATTR_TEXT_SIZE = { android.R.attr.textSize }; private static final int[] ATTR_TEXT_SIZE = { android.R.attr.textSize };
public static int getTextSizeFromTheme(Theme theme, int style, int defValue) { private static int getTextSizeFromTheme(Theme theme, int style, int defValue) {
// TODO: This method should return text size that is independent from the current
// system wide font size settings.
final TypedArray a = theme.obtainStyledAttributes(style, ATTR_TEXT_SIZE); final TypedArray a = theme.obtainStyledAttributes(style, ATTR_TEXT_SIZE);
final int textSize = a.getDimensionPixelSize(a.getResourceId(0, 0), defValue); final int textSize = a.getDimensionPixelSize(a.getResourceId(0, 0), defValue);
a.recycle(); a.recycle();