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

am 6fe326ae: am 761a6812: Don\'t reuse main keyboard\'s spacebar icon for Emoji palette 

* commit '6fe326ae42c084f03557d16cb098bb230494dde4':
  Don't reuse main keyboard's spacebar icon for Emoji palette
main
Tadashi G. Takaoka 2014-05-29 15:09:33 +00:00 committed by Android Git Automerger
parent 227dae053d 6fe326ae42
commit f41f7a185b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
View File

@ -369,8 +369,14 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
public void startEmojiPalettes(final String switchToAlphaLabel, public void startEmojiPalettes(final String switchToAlphaLabel,
final KeyVisualAttributes keyVisualAttr, final KeyboardIconsSet iconSet) { final KeyVisualAttributes keyVisualAttr, final KeyboardIconsSet iconSet) {
mDeleteKey.setImageDrawable(iconSet.getIconDrawable(KeyboardIconsSet.NAME_DELETE_KEY)); final int deleteIconResId = iconSet.getIconResourceId(KeyboardIconsSet.NAME_DELETE_KEY);
mSpacebar.setImageDrawable(iconSet.getIconDrawable(KeyboardIconsSet.NAME_SPACE_KEY)); if (deleteIconResId != 0) {
mDeleteKey.setImageResource(deleteIconResId);
}
final int spacebarResId = iconSet.getIconResourceId(KeyboardIconsSet.NAME_SPACE_KEY);
if (spacebarResId != 0) {
mSpacebar.setImageResource(spacebarResId);
}
final KeyDrawParams params = new KeyDrawParams(); final KeyDrawParams params = new KeyDrawParams();
params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr); params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr);
setupAlphabetKey(mAlphabetKeyLeft, switchToAlphaLabel, params); setupAlphabetKey(mAlphabetKeyLeft, switchToAlphaLabel, params);

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

@ -89,6 +89,7 @@ public final class KeyboardIconsSet {
private static int NUM_ICONS = NAMES_AND_ATTR_IDS.length / 2; private static int NUM_ICONS = NAMES_AND_ATTR_IDS.length / 2;
private static final String[] ICON_NAMES = new String[NUM_ICONS]; private static final String[] ICON_NAMES = new String[NUM_ICONS];
private final Drawable[] mIcons = new Drawable[NUM_ICONS]; private final Drawable[] mIcons = new Drawable[NUM_ICONS];
private final int[] mIconResourceIds = new int[NUM_ICONS];
static { static {
int iconId = ICON_UNDEFINED; int iconId = ICON_UNDEFINED;
@ -96,7 +97,7 @@ public final class KeyboardIconsSet {
final String name = (String)NAMES_AND_ATTR_IDS[i]; final String name = (String)NAMES_AND_ATTR_IDS[i];
final Integer attrId = (Integer)NAMES_AND_ATTR_IDS[i + 1]; final Integer attrId = (Integer)NAMES_AND_ATTR_IDS[i + 1];
if (attrId != ATTR_UNDEFINED) { if (attrId != ATTR_UNDEFINED) {
ATTR_ID_TO_ICON_ID.put(attrId, iconId); ATTR_ID_TO_ICON_ID.put(attrId, iconId);
} }
sNameToIdsMap.put(name, iconId); sNameToIdsMap.put(name, iconId);
ICON_NAMES[iconId] = name; ICON_NAMES[iconId] = name;
@ -113,6 +114,7 @@ public final class KeyboardIconsSet {
setDefaultBounds(icon); setDefaultBounds(icon);
final Integer iconId = ATTR_ID_TO_ICON_ID.get(attrId); final Integer iconId = ATTR_ID_TO_ICON_ID.get(attrId);
mIcons[iconId] = icon; mIcons[iconId] = icon;
mIconResourceIds[iconId] = keyboardAttrs.getResourceId(attrId, 0);
} catch (Resources.NotFoundException e) { } catch (Resources.NotFoundException e) {
Log.w(TAG, "Drawable resource for icon #" Log.w(TAG, "Drawable resource for icon #"
+ keyboardAttrs.getResources().getResourceEntryName(attrId) + keyboardAttrs.getResources().getResourceEntryName(attrId)
@ -137,8 +139,12 @@ public final class KeyboardIconsSet {
throw new RuntimeException("unknown icon name: " + name); throw new RuntimeException("unknown icon name: " + name);
} }
public Drawable getIconDrawable(final String name) { public int getIconResourceId(final String name) {
return getIconDrawable(getIconId(name)); final int iconId = getIconId(name);
if (isValidIconId(iconId)) {
return mIconResourceIds[iconId];
}
throw new RuntimeException("unknown icon name: " + name);
} }
public Drawable getIconDrawable(final int iconId) { public Drawable getIconDrawable(final int iconId) {