Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private" (6652e458) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/Keyboard.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -235,19 +235,6 @@ public class Keyboard {
		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) {
		switch (code) {
		case CODE_SHIFT: return "shift";

+15 −2

Original line number	Diff line number	Diff line
		@@ -191,11 +191,11 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
		if (DEBUG_CACHE) {
		Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": "
		+ ((ref == null) ? "LOAD" : "GCed") + " id=" + id
		+ " theme=" + Keyboard.themeName(keyboard.mThemeId));
		+ " theme=" + themeName(keyboard.mThemeId));
		}
		} else if (DEBUG_CACHE) {
		Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": HIT id=" + id
		+ " theme=" + Keyboard.themeName(keyboard.mThemeId));
		+ " theme=" + themeName(keyboard.mThemeId));
		}

		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;
		}
		}
		}