Make sure that each view has its own dedicated background drawable

Bug: 4998490
Change-Id: I3527fc41f0f03bbb32e3d1880665c6995354aa57
This commit is contained in:
Tadashi G. Takaoka 2011-07-06 17:42:03 -07:00
parent 273e5d60f4
commit 7c57e3bda1

View file

@ -333,7 +333,9 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
final TypedArray keyboardViewAttr = context.obtainStyledAttributes( final TypedArray keyboardViewAttr = context.obtainStyledAttributes(
attrs, R.styleable.KeyboardView, R.attr.keyboardViewStyle, R.style.KeyboardView); 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); R.styleable.KeyboardView_keyBackground);
final int keyTextColor = keyboardViewAttr.getColor( final int keyTextColor = keyboardViewAttr.getColor(
R.styleable.KeyboardView_keyTextColor, 0xFF000000); 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); mCandidatesPaneControl = (ViewGroup)findViewById(R.id.candidates_pane_control);
mExpandCandidatesPane = (TextView)findViewById(R.id.expand_candidates_pane); mExpandCandidatesPane = (TextView)findViewById(R.id.expand_candidates_pane);
mExpandCandidatesPane.setBackgroundDrawable(keyBackground); mExpandCandidatesPane.setBackgroundDrawable(expandBackground);
mExpandCandidatesPane.setTextColor(keyTextColor); mExpandCandidatesPane.setTextColor(keyTextColor);
mExpandCandidatesPane.setOnClickListener(new OnClickListener() { mExpandCandidatesPane.setOnClickListener(new OnClickListener() {
@Override @Override
@ -350,7 +352,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
} }
}); });
mCloseCandidatesPane = (TextView)findViewById(R.id.close_candidates_pane); mCloseCandidatesPane = (TextView)findViewById(R.id.close_candidates_pane);
mCloseCandidatesPane.setBackgroundDrawable(keyBackground); mCloseCandidatesPane.setBackgroundDrawable(closeBackground);
mCloseCandidatesPane.setTextColor(keyTextColor); mCloseCandidatesPane.setTextColor(keyTextColor);
mCloseCandidatesPane.setOnClickListener(new OnClickListener() { mCloseCandidatesPane.setOnClickListener(new OnClickListener() {
@Override @Override