diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-10-09 19:33:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 19:33:22 -0700 |
| commit | efa3ef17e9cb7cd47c2bd613e839d9f808d550b7 (patch) | |
| tree | 64ddc8a7264e9c21a7747ac20676fbb9f3ef0c83 /java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java | |
| parent | 2512314de199dd112a0a86b5899a67f1ed2e216a (diff) | |
| parent | 26a97909f6d1cfad2cc417a2bef91d977b076158 (diff) | |
am 26a97909: am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys"
* commit '26a97909f6d1cfad2cc417a2bef91d977b076158':
Prepare for changing text color for functional keys
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java b/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java index 7a2622cbb..8bdad364c 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java @@ -16,6 +16,7 @@ package com.android.inputmethod.keyboard.internal; +import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.Typeface; import android.util.SparseIntArray; @@ -37,7 +38,7 @@ public final class KeyVisualAttributes { public final float mHintLabelRatio; public final float mPreviewTextRatio; - public final int mTextColor; + public final ColorStateList mTextColorStateList; public final int mTextInactivatedColor; public final int mTextShadowColor; public final int mHintLetterColor; @@ -115,7 +116,7 @@ public final class KeyVisualAttributes { mPreviewTextRatio = ResourceUtils.getFraction(keyAttr, R.styleable.Keyboard_Key_keyPreviewTextRatio); - mTextColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextColor, 0); + mTextColorStateList = keyAttr.getColorStateList(R.styleable.Keyboard_Key_keyTextColor); mTextInactivatedColor = keyAttr.getColor( R.styleable.Keyboard_Key_keyTextInactivatedColor, 0); mTextShadowColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextShadowColor, 0); |