From cd61cadb717264953e56db5d292bf81fa88c81b7 Mon Sep 17 00:00:00 2001 From: satok Date: Sat, 26 Jun 2010 09:41:11 +0900 Subject: [PATCH] Remove additional layouts Change-Id: I65dbf3a4484b02ff1d854f704088ca527e273b85 --- java/res/drawable/keyboard_background_4.png | Bin 11964 -> 0 bytes java/res/drawable/keyboard_background_5.png | Bin 12227 -> 0 bytes java/res/layout/input3.xml | 31 ------------------ java/res/layout/input4.xml | 31 ------------------ java/res/layout/input5.xml | 31 ------------------ java/res/layout/input6.xml | 31 ------------------ java/res/values/strings.xml | 12 ------- .../inputmethod/latin/KeyboardSwitcher.java | 6 ++-- .../inputmethod/latin/LatinImeLogger.java | 4 +++ 9 files changed, 6 insertions(+), 140 deletions(-) delete mode 100644 java/res/drawable/keyboard_background_4.png delete mode 100644 java/res/drawable/keyboard_background_5.png delete mode 100755 java/res/layout/input3.xml delete mode 100755 java/res/layout/input4.xml delete mode 100755 java/res/layout/input5.xml delete mode 100755 java/res/layout/input6.xml diff --git a/java/res/drawable/keyboard_background_4.png b/java/res/drawable/keyboard_background_4.png deleted file mode 100644 index 74fc2e7627753059f4f1143ec60b702b7dabd936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11964 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 diff --git a/java/res/drawable/keyboard_background_5.png b/java/res/drawable/keyboard_background_5.png deleted file mode 100644 index 2e0fb289fc89ec798592502f3ef1974b99960f2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12227 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 - - - diff --git a/java/res/layout/input4.xml b/java/res/layout/input4.xml deleted file mode 100755 index b5da9d48f..000000000 --- a/java/res/layout/input4.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/java/res/layout/input5.xml b/java/res/layout/input5.xml deleted file mode 100755 index 2de11dfff..000000000 --- a/java/res/layout/input5.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/java/res/layout/input6.xml b/java/res/layout/input6.xml deleted file mode 100755 index 54f31044f..000000000 --- a/java/res/layout/input6.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index e310da7f6..64b8dbe59 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -332,19 +332,11 @@ Keyboard Theme Basic Basic (High Contrast) - Blue Ribbon - Dazzle - Blue Ribbon (High Contrast) - Dazzle (High Contrast) Default @string/layout_basic @string/layout_high_contrast - @string/layout_blue_ribbon - @string/layout_blue_ribbon_high - @string/layout_dazzle - @string/layout_dazzle_high @string/layout_stone @@ -352,10 +344,6 @@ 0 1 2 - 3 - 4 - 5 - 6 Debug (Temporary) 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})); }