diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-07-21 00:45:08 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-07-21 00:45:08 -0700 |
| commit | b880731620308433d7dc98a40249ba3e2a665826 (patch) | |
| tree | bf55309ccfd6243ef257fdce4091eeb9547e1570 /java/src | |
| parent | 60cb1cc7b35b988f79199c76af874bf35060ed70 (diff) | |
| parent | 5cce2161fb887b302c4479934b1ad8387aef4de0 (diff) | |
| download | latinime-b880731620308433d7dc98a40249ba3e2a665826.tar.gz latinime-b880731620308433d7dc98a40249ba3e2a665826.tar.xz latinime-b880731620308433d7dc98a40249ba3e2a665826.zip | |
Merge "Revert "Add Right-To-Left delete icon""
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java index 6256e7fbd..02c261bcd 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java @@ -34,21 +34,20 @@ public class KeyboardIconsSet { private static final int ICON_TO_SYMBOL_KEY = 2; private static final int ICON_TO_SYMBOL_KEY_WITH_SHORTCUT = 3; private static final int ICON_DELETE_KEY = 4; - private static final int ICON_DELETE_RTL_KEY = 5; - private static final int ICON_SETTINGS_KEY = 6; // This is also represented as "@icon/6" in xml. - private static final int ICON_SHORTCUT_KEY = 7; - private static final int ICON_SPACE_KEY = 8; - private static final int ICON_RETURN_KEY = 9; - private static final int ICON_SEARCH_KEY = 10; - private static final int ICON_TAB_KEY = 11; + private static final int ICON_SETTINGS_KEY = 5; // This is also represented as "@icon/5" in xml. + private static final int ICON_SHORTCUT_KEY = 6; + private static final int ICON_SPACE_KEY = 7; + private static final int ICON_RETURN_KEY = 8; + private static final int ICON_SEARCH_KEY = 9; + private static final int ICON_TAB_KEY = 10; // This should be aligned with Keyboard.keyIconShifted enum. - private static final int ICON_SHIFTED_SHIFT_KEY = 12; + private static final int ICON_SHIFTED_SHIFT_KEY = 11; // This should be aligned with Keyboard.keyIconPreview enum. - private static final int ICON_PREVIEW_TAB_KEY = 13; - private static final int ICON_PREVIEW_SETTINGS_KEY = 14; - private static final int ICON_PREVIEW_SHORTCUT_KEY = 15; + private static final int ICON_PREVIEW_TAB_KEY = 12; + private static final int ICON_PREVIEW_SETTINGS_KEY = 13; + private static final int ICON_PREVIEW_SHORTCUT_KEY = 14; - private static final int ICON_LAST = 15; + private static final int ICON_LAST = 14; private final Drawable mIcons[] = new Drawable[ICON_LAST + 1]; @@ -62,8 +61,6 @@ public class KeyboardIconsSet { return ICON_TO_SYMBOL_KEY_WITH_SHORTCUT; case R.styleable.Keyboard_iconDeleteKey: return ICON_DELETE_KEY; - case R.styleable.Keyboard_iconDeleteRtlKey: - return ICON_DELETE_RTL_KEY; case R.styleable.Keyboard_iconSettingsKey: return ICON_SETTINGS_KEY; case R.styleable.Keyboard_iconShortcutKey: |