aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-06-05 08:34:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-05 08:34:59 +0000
commit9c440d137300ddf72cca201cf08c9bb2e32d6836 (patch)
tree94307a72a38f2b29e7c0d2cc2bde924b6c1ed15e /java/src
parent9d4e25182699f383e38f37fbff69bc2a7c9304bf (diff)
parent3201e986473f18ed13e1e3dad87c2ecde1d3edc8 (diff)
downloadlatinime-9c440d137300ddf72cca201cf08c9bb2e32d6836.tar.gz
latinime-9c440d137300ddf72cca201cf08c9bb2e32d6836.tar.xz
latinime-9c440d137300ddf72cca201cf08c9bb2e32d6836.zip
Merge "Remove unnecessary Drawable.setState"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 2e8772635..7f335027f 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -808,10 +808,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
final KeyDrawParams drawParams = mKeyDrawParams;
previewText.setTextColor(drawParams.mPreviewTextColor);
final Drawable background = previewText.getBackground();
- if (background != null) {
- background.setState(KEY_PREVIEW_BACKGROUND_DEFAULT_STATE);
- background.setAlpha(PREVIEW_ALPHA);
- }
final String label = key.getPreviewLabel();
// What we show as preview should match what we show on a key top in onDraw().
if (label != null) {
@@ -865,6 +861,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
if (background != null) {
final int hasMoreKeys = (key.mMoreKeys != null) ? STATE_HAS_MOREKEYS : STATE_NORMAL;
background.setState(KEY_PREVIEW_BACKGROUND_STATE_TABLE[statePosition][hasMoreKeys]);
+ background.setAlpha(PREVIEW_ALPHA);
}
ViewLayoutUtils.placeViewAt(
previewText, previewX, previewY, previewWidth, previewHeight);