From 10bd458efc2cc04d30df279e68e43c242a6cc60a Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 19 May 2014 13:54:00 +0900 Subject: Rename Emoji related resource names more consistent Change-Id: I318a98feeaf7b8bc4d2ed6d54475a144e2dca0a1 --- .../android/inputmethod/keyboard/emoji/EmojiCategory.java | 12 ++++++------ .../keyboard/emoji/EmojiCategoryPageIndicatorView.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java index dd0e3e838..495fa554b 100644 --- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java +++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java @@ -70,12 +70,12 @@ final class EmojiCategory { "emoticons" }; private static final int[] sCategoryIcon = { - R.drawable.ic_emoji_recent_light, - R.drawable.ic_emoji_people_light, - R.drawable.ic_emoji_objects_light, - R.drawable.ic_emoji_nature_light, - R.drawable.ic_emoji_places_light, - R.drawable.ic_emoji_symbols_light, + R.drawable.ic_emoji_recent_holo_dark, + R.drawable.ic_emoji_people_holo_dark, + R.drawable.ic_emoji_objects_holo_dark, + R.drawable.ic_emoji_nature_holo_dark, + R.drawable.ic_emoji_places_holo_dark, + R.drawable.ic_emoji_symbols_holo_dark, 0 }; private static final String[] sCategoryLabel = diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java index 74cfd9b4b..f5aa1079e 100644 --- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java +++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java @@ -38,7 +38,7 @@ public final class EmojiCategoryPageIndicatorView extends LinearLayout { public EmojiCategoryPageIndicatorView(final Context context, final AttributeSet attrs) { super(context, attrs); mPaint.setColor(context.getResources().getColor( - R.color.emoji_category_page_id_view_foreground)); + R.color.emoji_category_page_id_foreground_holo)); } public void setCategoryPageId(final int size, final int id, final float offset) { -- cgit v1.2.3-83-g751a