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

am 6652e458: Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private" 

* commit '6652e4589981a0f06692b49e86d1a6f0784a434f':
  Move Keyboard.themeName to KeyboardSwitcher and make it private
main
Tadashi G. Takaoka 2011-12-15 10:08:30 -08:00 committed by Android Git Automerger
parent c479d88196 6652e45899
commit 4a7adcbace
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -235,19 +235,6 @@ public class Keyboard {
return mProximityInfo.getNearestKeys(x, y); return mProximityInfo.getNearestKeys(x, y);
} }
public static String themeName(int themeId) {
// This should be aligned with theme-*.xml resource files' themeId attribute.
switch (themeId) {
case 0: return "Basic";
case 1: return "BasicHighContrast";
case 5: return "IceCreamSandwich";
case 6: return "Stone";
case 7: return "StoneBold";
case 8: return "GingerBread";
default: return null;
}
}
public static String printableCode(int code) { public static String printableCode(int code) {
switch (code) { switch (code) {
case CODE_SHIFT: return "shift"; case CODE_SHIFT: return "shift";

17
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -191,11 +191,11 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
if (DEBUG_CACHE) { if (DEBUG_CACHE) {
Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": " Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": "
+ ((ref == null) ? "LOAD" : "GCed") + " id=" + id + ((ref == null) ? "LOAD" : "GCed") + " id=" + id
+ " theme=" + Keyboard.themeName(keyboard.mThemeId)); + " theme=" + themeName(keyboard.mThemeId));
} }
} else if (DEBUG_CACHE) { } else if (DEBUG_CACHE) {
Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": HIT id=" + id Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": HIT id=" + id
+ " theme=" + Keyboard.themeName(keyboard.mThemeId)); + " theme=" + themeName(keyboard.mThemeId));
} }
keyboard.onAutoCorrectionStateChanged(mIsAutoCorrectionActive); keyboard.onAutoCorrectionStateChanged(mIsAutoCorrectionActive);
@ -463,4 +463,17 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
} }
} }
} }
private static String themeName(int themeId) {
// This should be aligned with theme-*.xml resource files' themeId attribute.
switch (themeId) {
case 0: return "Basic";
case 1: return "BasicHighContrast";
case 5: return "IceCreamSandwich";
case 6: return "Stone";
case 7: return "StoneBold";
case 8: return "GingerBread";
default: return null;
}
}
} }