Tweak ICS theme a bit
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
index 26a5427..1ab6160 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
new file mode 100644
index 0000000..7ca3e61
--- /dev/null
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led_holo.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led_holo.9.png
new file mode 100644
index 0000000..34a1ebd
--- /dev/null
+++ b/java/res/drawable-hdpi/sym_keyboard_space_led_holo.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
index a2df532..7d76743 100644
--- a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
new file mode 100644
index 0000000..3639363
--- /dev/null
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_led_holo.9.png b/java/res/drawable-mdpi/sym_keyboard_space_led_holo.9.png
new file mode 100644
index 0000000..abd8b74
--- /dev/null
+++ b/java/res/drawable-mdpi/sym_keyboard_space_led_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
index b5e514b..47eee32 100644
--- a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png b/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png
new file mode 100644
index 0000000..e192aaf
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png
Binary files differ
diff --git a/java/res/layout/candidate_divider.xml b/java/res/layout/candidate_divider.xml
index a1059dc..dc5e779 100644
--- a/java/res/layout/candidate_divider.xml
+++ b/java/res/layout/candidate_divider.xml
@@ -18,13 +18,10 @@
*/
-->
-<TextView
+<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/label_candidate_divider"
- android:textSize="@dimen/candidate_text_size"
- android:gravity="center"
+ android:src="@drawable/keyboard_suggest_strip_divider"
android:padding="0dp"
- android:focusable="false"
- android:clickable="false" />
+ android:gravity="center" />
diff --git a/java/res/layout/candidate_info.xml b/java/res/layout/candidate_info.xml
index f355728..a364d46 100644
--- a/java/res/layout/candidate_info.xml
+++ b/java/res/layout/candidate_info.xml
@@ -24,5 +24,4 @@
android:layout_height="wrap_content"
android:textSize="6sp"
android:textColor="@android:color/white"
- android:visibility="gone"
style="?attr/suggestionBackgroundStyle" />
diff --git a/java/res/layout/candidates_strip.xml b/java/res/layout/candidates_strip.xml
index 0f542c0..2d90886 100644
--- a/java/res/layout/candidates_strip.xml
+++ b/java/res/layout/candidates_strip.xml
@@ -27,9 +27,7 @@
android:orientation="horizontal"
android:layout_weight="1.0"
android:layout_width="0dp"
- android:layout_height="match_parent"
- >
- </LinearLayout>
+ android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/candidates_pane_control"
android:orientation="horizontal"
@@ -42,22 +40,22 @@
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:minWidth="30dp"
android:textSize="@dimen/candidate_text_size"
- android:padding="0dp"
+ android:paddingRight="8dp"
+ android:paddingLeft="8dp"
android:visibility="visible"
- style="?attr/suggestionBackgroundStyle" />
+ android:background="@drawable/btn_keyboard_key_ics" />
<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="30dp"
android:textSize="@dimen/candidate_text_size"
- android:padding="0dp"
+ android:paddingRight="8dp"
+ android:paddingLeft="8dp"
android:visibility="gone"
- style="?attr/suggestionBackgroundStyle" />
+ android:background="@drawable/btn_keyboard_key_ics" />
</LinearLayout>
<LinearLayout
android:id="@+id/touch_to_save"
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index d5ca250..4a07156 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -57,7 +57,7 @@
<dimen name="key_preview_offset_ics">0.01in</dimen>
- <dimen name="candidate_strip_height">38dip</dimen>
+ <dimen name="candidate_strip_height">36dip</dimen>
<dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 1a82b0c..c89a5cd 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -68,7 +68,7 @@
<dimen name="key_preview_height_ics">15.0mm</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
- <dimen name="candidate_strip_height">46dip</dimen>
+ <dimen name="candidate_strip_height">44dip</dimen>
<dimen name="candidate_strip_padding">15.0mm</dimen>
<dimen name="candidate_min_width">0.3in</dimen>
<dimen name="candidate_padding">12dip</dimen>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index 81a68e2..f98cabb 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -69,7 +69,7 @@
<dimen name="key_preview_height_ics">15.0mm</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
- <dimen name="candidate_strip_height">46dip</dimen>
+ <dimen name="candidate_strip_height">44dip</dimen>
<!-- candidate_strip_minimum_height =
key_preview_height_holo - key_preview_offset_holo + alpha -->
<dimen name="candidate_strip_minimum_height">18mm</dimen>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index fb99336..cf9138b 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -120,7 +120,6 @@
<attr name="colorTypedWord" format="color" />
<attr name="colorAutoCorrect" format="color" />
<attr name="colorSuggested" format="color" />
- <attr name="colorDivider" format="color" />
<attr name="candidateCountInStrip" format="integer" />
</declare-styleable>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 6cf5fe9..095ef42 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -73,7 +73,7 @@
<dimen name="key_preview_height_ics">80sp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
- <dimen name="candidate_strip_height">42dip</dimen>
+ <dimen name="candidate_strip_height">40dip</dimen>
<!-- candidate_strip_minimum_height =
key_preview_height_holo - key_preview_offset_holo + alpha -->
<dimen name="candidate_strip_minimum_height">100sp</dimen>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index c813152..bf2d13d 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -50,7 +50,7 @@
<item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item>
<item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
<!-- LatinKeyboard icons -->
- <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
</style>
</resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index c0cc8fb..f731d01 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -92,7 +92,6 @@
<item name="colorTypedWord">#FFFFFFFF</item>
<item name="colorAutoCorrect">#FFFCAE00</item>
<item name="colorSuggested">#FFFCAE00</item>
- <item name="colorDivider">#20FFFFFF</item>
<item name="candidateCountInStrip">@integer/candidate_count_in_strip</item>
</style>
<!-- Theme "Basic high contrast" -->
@@ -191,9 +190,8 @@
<style name="CandidateViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich">
<item name="autoCorrectHighlight">autoCorrectBold|autoCorrectInvert</item>
<item name="colorTypedWord">#FFFFFFFF</item>
- <item name="colorAutoCorrect">#FFFFFFFF</item>
+ <item name="colorAutoCorrect">#FF3DC8FF</item>
<item name="colorSuggested">#FFFFFFFF</item>
- <item name="colorDivider">#20FFFFFF</item>
<item name="candidateCountInStrip">@integer/candidate_count_in_strip</item>
</style>
<style name="PopupMiniKeyboardAnimation">
