diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-07-06 19:12:39 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-07-06 19:12:39 -0700 |
| commit | c810b0d63a6f7248d9385ee35ac37dca8f029137 (patch) | |
| tree | 6a1aff8816337fe5e431084889469d5f881a98af /java/src | |
| parent | b9a21448e3609599731907fab9ac8e37423e982d (diff) | |
| parent | 7c57e3bda1ab1d8c5d5df7acb8aec8c089f9240b (diff) | |
| download | latinime-c810b0d63a6f7248d9385ee35ac37dca8f029137.tar.gz latinime-c810b0d63a6f7248d9385ee35ac37dca8f029137.tar.xz latinime-c810b0d63a6f7248d9385ee35ac37dca8f029137.zip | |
Merge "Make sure that each view has its own dedicated background drawable"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/CandidateView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java index e859f3acf..df557fb96 100644 --- a/java/src/com/android/inputmethod/latin/CandidateView.java +++ b/java/src/com/android/inputmethod/latin/CandidateView.java @@ -333,7 +333,9 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo final TypedArray keyboardViewAttr = context.obtainStyledAttributes( attrs, R.styleable.KeyboardView, R.attr.keyboardViewStyle, R.style.KeyboardView); - final Drawable keyBackground = keyboardViewAttr.getDrawable( + final Drawable expandBackground = keyboardViewAttr.getDrawable( + R.styleable.KeyboardView_keyBackground); + final Drawable closeBackground = keyboardViewAttr.getDrawable( R.styleable.KeyboardView_keyBackground); final int keyTextColor = keyboardViewAttr.getColor( R.styleable.KeyboardView_keyTextColor, 0xFF000000); @@ -341,7 +343,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo mCandidatesPaneControl = (ViewGroup)findViewById(R.id.candidates_pane_control); mExpandCandidatesPane = (TextView)findViewById(R.id.expand_candidates_pane); - mExpandCandidatesPane.setBackgroundDrawable(keyBackground); + mExpandCandidatesPane.setBackgroundDrawable(expandBackground); mExpandCandidatesPane.setTextColor(keyTextColor); mExpandCandidatesPane.setOnClickListener(new OnClickListener() { @Override @@ -350,7 +352,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo } }); mCloseCandidatesPane = (TextView)findViewById(R.id.close_candidates_pane); - mCloseCandidatesPane.setBackgroundDrawable(keyBackground); + mCloseCandidatesPane.setBackgroundDrawable(closeBackground); mCloseCandidatesPane.setTextColor(keyTextColor); mCloseCandidatesPane.setOnClickListener(new OnClickListener() { @Override |