From 7c57e3bda1ab1d8c5d5df7acb8aec8c089f9240b Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 6 Jul 2011 17:42:03 -0700 Subject: [PATCH] Make sure that each view has its own dedicated background drawable Bug: 4998490 Change-Id: I3527fc41f0f03bbb32e3d1880665c6995354aa57 --- java/src/com/android/inputmethod/latin/CandidateView.java | 8 +++++--- 1 file 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 7ec18b38a..8d6011708 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