From cd61cadb717264953e56db5d292bf81fa88c81b7 Mon Sep 17 00:00:00 2001 From: satok Date: Sat, 26 Jun 2010 09:41:11 +0900 Subject: Remove additional layouts Change-Id: I65dbf3a4484b02ff1d854f704088ca527e273b85 --- java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 6 ++---- java/src/com/android/inputmethod/latin/LatinImeLogger.java | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index 3c0ab5a4e..665e16aec 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -48,12 +48,10 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public static final int KEYBOARDMODE_IM = R.id.mode_im; public static final int KEYBOARDMODE_WEB = R.id.mode_webentry; - public static final String DEFAULT_LAYOUT_ID = "6"; + public static final String DEFAULT_LAYOUT_ID = "2"; public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout"; private static final int[] LAYOUTS = new int [] { - R.layout.input, R.layout.input2, R.layout.input3, R.layout.input4, R.layout.input5, - R.layout.input6, R.layout.input7 - }; + R.layout.input, R.layout.input2, R.layout.input7}; private static final int SYMBOLS_MODE_STATE_NONE = 0; private static final int SYMBOLS_MODE_STATE_BEGIN = 1; diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java index 1e467d9a6..42d5689d2 100644 --- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java +++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java @@ -263,6 +263,10 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang if (sLOGPRINT) { Log.d(TAG, "Log theme Id. (1)"); } + // TODO: Not to convert theme ID here. Currently "2" is treated as "6" in a log server. + if (mThemeId == "2") { + mThemeId = "6"; + } mLogBuffer.add(new LogEntry (time, ID_THEME_ID, new String[] {mThemeId})); } -- cgit v1.2.3-83-g751a