nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add Right-To-Left delete icon" 

This reverts commit 886246b19a.

Bug: 5047500
Change-Id: Iefef20b7aeba0dbedfe8f81384a33f65e3907e9f
main
Tadashi G. Takaoka 2011-07-21 00:02:35 -07:00
parent 8507589085
commit 5cce2161fb
20 changed files with 41 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/res/drawable-hdpi/sym_bkeyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
java/res/drawable-hdpi/sym_keyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
java/res/drawable-hdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
java/res/drawable-mdpi/sym_bkeyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 718 B

BIN
java/res/drawable-mdpi/sym_keyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
java/res/drawable-mdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 812 B

BIN
java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 812 B

BIN
java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
java/res/drawable-xhdpi/sym_bkeyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
java/res/drawable-xhdpi/sym_keyboard_delete_rtl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

BIN
java/res/drawable-xhdpi/sym_keyboard_delete_rtl_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

22
java/res/values/attrs.xml
View File

@ -155,7 +155,6 @@
<attr name="iconToSymbolKey" format="reference" />
<attr name="iconToSymbolKeyWithShortcut" format="reference" />
<attr name="iconDeleteKey" format="reference" />
<attr name="iconDeleteRtlKey" format="reference" />
<attr name="iconSettingsKey" format="reference" />
<attr name="iconShortcutKey" format="reference" />
<attr name="iconSpaceKey" format="reference" />
@ -209,25 +208,24 @@
<enum name="iconToSymbolKey" value="2" />
<enum name="iconToSymbolKeyWithShortcut" value="3" />
<enum name="iconDeleteKey" value="4" />
<enum name="iconDeleteRtlKey" value="5" />
<enum name="iconSettingsKey" value="6" />
<enum name="iconShortcutKey" value="7" />
<enum name="iconSpaceKey" value="8" />
<enum name="iconReturnKey" value="9" />
<enum name="iconSearchKey" value="10" />
<enum name="iconTabKey" value="11" />
<enum name="iconSettingsKey" value="5" />
<enum name="iconShortcutKey" value="6" />
<enum name="iconSpaceKey" value="7" />
<enum name="iconReturnKey" value="8" />
<enum name="iconSearchKey" value="9" />
<enum name="iconTabKey" value="10" />
</attr>
<!-- Shift key icon for shifted state -->
<attr name="keyIconShifted" format="enum">
<!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
<enum name="iconShiftedShiftKey" value="12" />
<enum name="iconShiftedShiftKey" value="11" />
</attr>
<!-- The icon to show in the popup preview. -->
<attr name="keyIconPreview" format="enum">
<!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->
<enum name="iconPreviewTabKey" value="13" />
<enum name="iconPreviewSettingsKey" value="14" />
<enum name="iconPreviewShortcutKey" value="15" />
<enum name="iconPreviewTabKey" value="12" />
<enum name="iconPreviewSettingsKey" value="13" />
<enum name="iconPreviewShortcutKey" value="14" />
</attr>
<!-- The key style to specify a set of key attributes defined by <key_style/> -->
<attr name="keyStyle" format="string" />

2
java/res/values/keyboard-icons-black.xml
View File

@ -24,8 +24,6 @@
<item name="iconShiftKey">@drawable/sym_bkeyboard_shift</item>
<item name="iconToSymbolKeyWithShortcut">@drawable/sym_bkeyboard_123_mic</item>
<item name="iconDeleteKey">@drawable/sym_bkeyboard_delete</item>
<!-- TODO: update this icon drawable -->
<item name="iconDeleteRtlKey">@drawable/sym_bkeyboard_delete_rtl</item>
<item name="iconSettingsKey">@drawable/sym_bkeyboard_settings</item>
<item name="iconShortcutKey">@drawable/sym_bkeyboard_mic</item>
<item name="iconSpaceKey">@drawable/sym_bkeyboard_space</item>

2
java/res/values/keyboard-icons-ics.xml
View File

@ -23,8 +23,6 @@
<item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>
<item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic_holo</item>
<item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>
<!-- TODO: update this icon drawable -->
<item name="iconDeleteRtlKey">@drawable/sym_keyboard_delete_rtl_holo</item>
<item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
<item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
<item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>

2
java/res/values/keyboard-icons-white.xml
View File

@ -20,8 +20,6 @@
<item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
<item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
<item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
<!-- TODO: update this icon drawable -->
<item name="iconDeleteRtlKey">@drawable/sym_keyboard_delete_rtl</item>
<item name="iconSettingsKey">@drawable/sym_keyboard_settings</item>
<item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>
<item name="iconSpaceKey">@drawable/sym_keyboard_space</item>

26
java/res/xml-sw600dp/kbd_key_styles.xml
View File

@ -38,7 +38,7 @@
<key-style
latin:styleName="settingsPopupStyle"
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="\@icon/6|\@integer/key_settings"
latin:popupCharacters="\@icon/5|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</default>
</switch>
@ -50,24 +50,12 @@
latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" />
<switch>
<case latin:languageCode="ar|iw">
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteRtlKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</case>
<default>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"

24
java/res/xml-sw768dp/kbd_key_styles.xml
View File

@ -32,24 +32,12 @@
latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" />
<switch>
<case latin:languageCode="ar|iw">
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteRtlKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</case>
<default>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"

28
java/res/xml/kbd_key_styles.xml
View File

@ -47,7 +47,7 @@
<key-style
latin:styleName="settingsPopupStyle"
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="\@icon/6|\@integer/key_settings"
latin:popupCharacters="\@icon/5|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</default>
</switch>
@ -59,26 +59,12 @@
latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" />
<switch>
<case
latin:languageCode="ar|iw"
>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteRtlKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</case>
<default>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
<!-- Return key style -->
<switch>
<case

25
java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
View File

@ -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: