diff --git a/java/res/layout/candidates_strip.xml b/java/res/layout/candidates_strip.xml index 2d908863cbb1d3f4e77d9901a0bf640dbb12ecd7..269bc1bc358da5f593ebb9449934809a68c826ac 100644 --- a/java/res/layout/candidates_strip.xml +++ b/java/res/layout/candidates_strip.xml @@ -40,22 +40,18 @@ android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" + android:minWidth="28dp" android:textSize="@dimen/candidate_text_size" - android:paddingRight="8dp" - android:paddingLeft="8dp" - android:visibility="visible" - android:background="@drawable/btn_keyboard_key_ics" /> + android:visibility="visible" /> <TextView android:id="@+id/close_candidates_pane" android:text="@string/label_close_candidates_pane" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" + android:minWidth="28dp" android:textSize="@dimen/candidate_text_size" - android:paddingRight="8dp" - android:paddingLeft="8dp" - android:visibility="gone" - android:background="@drawable/btn_keyboard_key_ics" /> + android:visibility="gone" /> </LinearLayout> <LinearLayout android:id="@+id/touch_to_save" diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java index 1ab7c6d42bbc4fe685f0fa7300cbcd1d7105f9a5..7ec18b38ac409ac5962e24644ef193492cf885df 100644 --- a/java/src/com/android/inputmethod/latin/CandidateView.java +++ b/java/src/com/android/inputmethod/latin/CandidateView.java @@ -21,6 +21,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Message; import android.text.Spannable; import android.text.SpannableString; @@ -330,9 +331,18 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo mInvertedForegroundColorSpan = new ForegroundColorSpan(mColorTypedWord ^ 0x00ffffff); mInvertedBackgroundColorSpan = new BackgroundColorSpan(mColorTypedWord); + final TypedArray keyboardViewAttr = context.obtainStyledAttributes( + attrs, R.styleable.KeyboardView, R.attr.keyboardViewStyle, R.style.KeyboardView); + final Drawable keyBackground = keyboardViewAttr.getDrawable( + R.styleable.KeyboardView_keyBackground); + final int keyTextColor = keyboardViewAttr.getColor( + R.styleable.KeyboardView_keyTextColor, 0xFF000000); + keyboardViewAttr.recycle(); + mCandidatesPaneControl = (ViewGroup)findViewById(R.id.candidates_pane_control); mExpandCandidatesPane = (TextView)findViewById(R.id.expand_candidates_pane); - mExpandCandidatesPane.getBackground().setAlpha(180); + mExpandCandidatesPane.setBackgroundDrawable(keyBackground); + mExpandCandidatesPane.setTextColor(keyTextColor); mExpandCandidatesPane.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { @@ -340,7 +350,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo } }); mCloseCandidatesPane = (TextView)findViewById(R.id.close_candidates_pane); - mCloseCandidatesPane.getBackground().setAlpha(180); + mCloseCandidatesPane.setBackgroundDrawable(keyBackground); + mCloseCandidatesPane.setTextColor(keyTextColor); mCloseCandidatesPane.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) {