From 673aed42c3b291fc9f81ead58ca35a5d150f4dce Mon Sep 17 00:00:00 2001 From: satok Date: Mon, 30 Aug 2010 18:38:36 +0900 Subject: [PATCH] Add settings button - delete unused keyboard layout Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6 --- .../sym_keyboard_feedback_settings.png | Bin 0 -> 729 bytes .../drawable-hdpi/sym_keyboard_settings.png | Bin 0 -> 1459 bytes .../sym_keyboard_feedback_settings.png | Bin 0 -> 729 bytes java/res/drawable/sym_keyboard_settings.png | Bin 0 -> 1459 bytes java/res/values/keycodes.xml | 1 + java/res/xml/kbd_alpha.xml | 106 ------------------ java/res/xml/kbd_alpha_black.xml | 106 ------------------ java/res/xml/kbd_qwerty.xml | 58 +++++----- java/res/xml/kbd_qwerty_black.xml | 62 +++++----- java/res/xml/kbd_symbols.xml | 9 +- java/res/xml/kbd_symbols_black.xml | 9 +- java/res/xml/kbd_symbols_shift.xml | 9 +- java/res/xml/kbd_symbols_shift_black.xml | 9 +- .../inputmethod/latin/KeyboardSwitcher.java | 17 +-- 14 files changed, 93 insertions(+), 293 deletions(-) create mode 100644 java/res/drawable-hdpi/sym_keyboard_feedback_settings.png create mode 100644 java/res/drawable-hdpi/sym_keyboard_settings.png create mode 100644 java/res/drawable/sym_keyboard_feedback_settings.png create mode 100644 java/res/drawable/sym_keyboard_settings.png delete mode 100644 java/res/xml/kbd_alpha.xml delete mode 100644 java/res/xml/kbd_alpha_black.xml diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..08ba18f28db90ae647f03e5ee4111cc29a2ebb27 GIT binary patch literal 729 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 + -100 -103 diff --git a/java/res/xml/kbd_alpha.xml b/java/res/xml/kbd_alpha.xml deleted file mode 100644 index 4e8af3399..000000000 --- a/java/res/xml/kbd_alpha.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/java/res/xml/kbd_alpha_black.xml b/java/res/xml/kbd_alpha_black.xml deleted file mode 100644 index 108e466b8..000000000 --- a/java/res/xml/kbd_alpha_black.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index b0450c6cd..59c61e4c8 100755 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -111,74 +111,81 @@ + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + @@ -187,12 +194,11 @@ android:keyWidth="20%p" android:isRepeatable="true"/> - + android:keyWidth="15%p"/> + + android:keyWidth="15%p" android:keyEdgeFlags="right"/> - - diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index afea2f379..076359c95 100755 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -110,75 +110,82 @@ - + + - + + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - + android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - + + android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + @@ -187,11 +194,12 @@ android:keyWidth="20%p" android:isRepeatable="true"/> - + android:keyWidth="15%p"/> + + android:keyWidth="15%p" android:keyEdgeFlags="right"/> diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index 77eb7d059..3f6b8ac85 100755 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -123,16 +123,19 @@ + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml index 5f8dfbeaa..7eae55481 100755 --- a/java/res/xml/kbd_symbols_black.xml +++ b/java/res/xml/kbd_symbols_black.xml @@ -123,16 +123,19 @@ + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + - diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml index 467ca529f..0ec4c713c 100755 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_symbols_shift.xml @@ -89,16 +89,19 @@ - + diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml index 511ad4981..250e0854c 100755 --- a/java/res/xml/kbd_symbols_shift_black.xml +++ b/java/res/xml/kbd_symbols_shift_black.xml @@ -89,16 +89,19 @@ - + diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index 45a54b1aa..a50c5aa41 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -37,11 +37,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public static final int MODE_EMAIL = 5; public static final int MODE_IM = 6; public static final int MODE_WEB = 7; - - public static final int MODE_TEXT_QWERTY = 0; - public static final int MODE_TEXT_ALPHA = 1; - public static final int MODE_TEXT_COUNT = 2; - + public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal; public static final int KEYBOARDMODE_URL = R.id.mode_url; public static final int KEYBOARDMODE_EMAIL = R.id.mode_email; @@ -59,7 +55,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha private static final int CHAR_THEME_COLOR_BLACK = 1; // Tables which contains resource ids for each character theme color - private static final int[] KBD_ALPHA = new int[] {R.xml.kbd_alpha, R.xml.kbd_alpha_black}; private static final int[] KBD_PHONE = new int[] {R.xml.kbd_phone, R.xml.kbd_phone_black}; private static final int[] KBD_PHONE_SYMBOLS = new int[] { R.xml.kbd_phone_symbols, R.xml.kbd_phone_symbols_black}; @@ -92,7 +87,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha private int mMode = MODE_NONE; /** One of the MODE_XXX values */ private int mImeOptions; - private int mTextMode = MODE_TEXT_QWERTY; private boolean mIsSymbols; private boolean mHasVoice; private boolean mVoiceOnPrimary; @@ -291,11 +285,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha "getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols); /* fall through */ case MODE_TEXT: - if (mTextMode == MODE_TEXT_ALPHA) { - return new KeyboardId( - KBD_ALPHA[charColorId], KEYBOARDMODE_NORMAL, true, hasVoice); - } - // Normally mTextMode should be MODE_TEXT_QWERTY. return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice); case MODE_SYMBOLS: return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice); @@ -320,10 +309,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha boolean isTextMode() { return mMode == MODE_TEXT; } - - int getTextModeCount() { - return MODE_TEXT_COUNT; - } boolean isAlphabetMode() { if (mCurrentId == null) {