From b72f348467888d6f759f8b287ec94425c2748ec0 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Wed, 26 May 2010 18:30:31 +0900
Subject: [PATCH] Add new UI for Gingerbread refering to Heiko's sample

Change-Id: I80db4a52f5bbb25c77dfe7df94bdced69debf831
---
 java/res/drawable/background_gradient.xml     |  22 +++++++++++
 java/res/drawable/btn_keyboard_key_ginger.xml |  36 ++++++++++++++++++
 .../btn_keyboard_key_normal_ginger.9.png      | Bin 0 -> 2116 bytes
 .../btn_keyboard_key_normal_off_ginger.9.png  | Bin 0 -> 2198 bytes
 .../btn_keyboard_key_normal_on_ginger.9.png   | Bin 0 -> 2242 bytes
 .../drawable/btn_keyboard_normal_metal.9.png  | Bin 0 -> 5069 bytes
 java/res/drawable/btn_led_off.9.png           | Bin 0 -> 505 bytes
 java/res/drawable/btn_led_on.9.png            | Bin 0 -> 575 bytes
 java/res/layout/input7.xml                    |  33 ++++++++++++++++
 java/res/values/colors.xml                    |   2 +
 java/res/values/strings.xml                   |   3 ++
 .../inputmethod/latin/KeyboardSwitcher.java   |   4 +-
 .../inputmethod/latin/LatinKeyboard.java      |   2 +-
 13 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 java/res/drawable/background_gradient.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_ginger.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_normal_ginger.9.png
 create mode 100644 java/res/drawable/btn_keyboard_key_normal_off_ginger.9.png
 create mode 100644 java/res/drawable/btn_keyboard_key_normal_on_ginger.9.png
 create mode 100644 java/res/drawable/btn_keyboard_normal_metal.9.png
 create mode 100644 java/res/drawable/btn_led_off.9.png
 create mode 100644 java/res/drawable/btn_led_on.9.png
 create mode 100755 java/res/layout/input7.xml

diff --git a/java/res/drawable/background_gradient.xml b/java/res/drawable/background_gradient.xml
new file mode 100644
index 000000000..52e2b16be
--- /dev/null
+++ b/java/res/drawable/background_gradient.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#FF000000"
+        android:endColor="#FF383838"
+        android:angle="90"/>
+</shape>
diff --git a/java/res/drawable/btn_keyboard_key_ginger.xml b/java/res/drawable/btn_keyboard_key_ginger.xml
new file mode 100644
index 000000000..7477037b8
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_ginger.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+
+    <item android:state_checkable="true" android:state_checked="true"
+          android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on_ginger" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_off_ginger" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on_ginger" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_off_ginger" />
+
+    <!-- Normal keys -->
+
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal_ginger" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key_normal_ginger.9.png b/java/res/drawable/btn_keyboard_key_normal_ginger.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..46747bde613896d0eca646c780a4876aad065759
GIT binary patch
literal 2116
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

literal 0
HcmV?d00001

diff --git a/java/res/drawable/btn_keyboard_key_normal_off_ginger.9.png b/java/res/drawable/btn_keyboard_key_normal_off_ginger.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..32c8e2e2a391b7a5d12eabf4fd512b453efef294
GIT binary patch
literal 2198
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
Y|0lh~rqU^8wg3PC07*qoM6N<$f~@iahyVZp

literal 0
HcmV?d00001

diff --git a/java/res/drawable/btn_keyboard_key_normal_on_ginger.9.png b/java/res/drawable/btn_keyboard_key_normal_on_ginger.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9814dae53f97a9a680ded1ee3ba7acde662add6
GIT binary patch
literal 2242
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
QxBvhE07*qoM6N<$f{>$7RsaA1

literal 0
HcmV?d00001

diff --git a/java/res/drawable/btn_keyboard_normal_metal.9.png b/java/res/drawable/btn_keyboard_normal_metal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4fe0a8a02ab3721f90cf4d64f855d00de9400fb
GIT binary patch
literal 5069
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

literal 0
HcmV?d00001

diff --git a/java/res/drawable/btn_led_off.9.png b/java/res/drawable/btn_led_off.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ce7a67a23f6a4d8a0940bbf77ac34e1b618035
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^MnLSs!3HD`yQJkZFfbnQba4!+xb^m$w>MLu#IeH9
zP1g-$c#K+Fc1?-Q%)Me5d&70bfjzFlz870Py*XBHU2WDl|I&IxTlI5`R5HSkSGCxu
zx0D<1w=`aCcmI8jjl6yR??VDk9EvR<;=kM^m*|Y1xQpDoT%|Sk=m^x?$eEk^T6eoB
ziT}9g$}AJFHu+@on%AcpE(Rz{@Yp5ob<*8wTw2o5wlLrY-)hD5t1S<*u1{z_9DKz^
zY}JXZ4Dq{1k~TUUuGUeR=&@tRqa^ihs*CnaxG~qZaCT>8s^X5N^EP~W!Wq7=AtaFb
z=8W1fF(JNo`3+n4H?uG`>ZKh&<zzJTjH`*1?1|{r+ZtAQBxuj|`+j82CV|tNq;|&m
zIsB405Zx*K{(Sq6wO&gv?VAxQW;FZkrER&>OJeP(&yfB3YOVJXPqW!u)hBz#ozdd{
zXrpg1|9tY|iy4<q&hp*!VJdF1S{bsce{P2V^2<!moRY#`#+S``(Dm4&YGXu>R9j(h
z`!BikX9do;1nW&-z3#Qzv}gOL?YNa8x^|(>DMjYY6X)yqgToC>%vX>rNANINbqtSm
cEBBety?I6NQ?BI;V3aa=y85}Sb4q9e0F9c|%m4rY

literal 0
HcmV?d00001

diff --git a/java/res/drawable/btn_led_on.9.png b/java/res/drawable/btn_led_on.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe77abb08e8a87dc6f49872d4fa1214d04b7c5ff
GIT binary patch
literal 575
zcmeAS@N?(olHy`uVBq!ia0vp^MnLSs!3HD`yQJkZFfg%sx;TbZ+<JS>-(zy2%<+%x
z$^|E#UJ9^k{c~LC7uRJ|A|NT!*pYF;F@QzYi-*TXf`8)DvnQ4u<7?_!;CRWXsA<s-
zh0T_+YPXfUIHPk+YLCek-<&b+e%<~L8p1X`_rH8@{{FVO(suvh&y$xtk(*S|cZ{8h
zMZkf95lHZHUEFwX<GM|+BDbz73S)d-vC84ns##p#?`E9;cB<@d_~PJOZ)Q!|QvLo*
z@b;?WC!b#ZnG@3R!sz^x=V9AYO1JQ*?Wm6VHDB$#=Of#nOTwe$=l;l8VOu);tx<Wt
zua8Hht7B$!%$0A4W=e0-d3rIfv_D-t)c2@qjkb=<JN??UqL>*Qf9eM=lH0#C<8gGN
zqS*4pcYEJ^m8g{T3Vpqm&GBLFh6x)V^uBP}(e}-E@4my^4>{SbE>{kI-D|S)s_L1Q
zrvD!Tb*)SIej>-E&nN%R5|^`UY-1h(#kyy0JtzIH`gP~s<@)=hzx#BSP88Z!0yIy+
z{^sU=$J_MR=R`f9wte1Yp?ZgT6~F(BJ?ejPd)myfI$oaEq;EC*M1P(4GbuRpwmR||
z-;A7ly~|g3-=4c=OYV}&wa3k0n}64|U-LZp+1jmMkC%rQnXIzrv(`SuwW3~qP4<_C
zRxXPrEB-PuaVRt}KnM>bg%)X0aD&4fov@rD;Pr7yy;c8B=>^8IO2CA{;OXk;vd$@?
F2>{eN1i1hJ

literal 0
HcmV?d00001

diff --git a/java/res/layout/input7.xml b/java/res/layout/input7.xml
new file mode 100755
index 000000000..111d87ba7
--- /dev/null
+++ b/java/res/layout/input7.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<com.android.inputmethod.latin.LatinKeyboardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/keyboardView"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:keyBackground="@drawable/btn_keyboard_key_ginger"
+        android:background="@drawable/background_gradient"
+        android:keyTextColor="@color/latinkeyboard_key_color_black"
+        android:shadowColor="@color/latinkeyboard_key_color_white"
+        android:keyTextSize="22dip"
+        />
+<!--         android:keyBackground="@drawable/btn_keyboard_normal_metal"-->
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 6eb362bd8..4581cc961 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -26,4 +26,6 @@
     <color name="latinkeyboard_bar_language_text">#FF808080</color>
     <color name="latinkeyboard_extension_background">#A0000000</color>
     <color name="latinkeyboard_text_color">#FF000000</color>
+    <color name="latinkeyboard_key_color_white">#FFFFFFFF</color>
+    <color name="latinkeyboard_key_color_black">#FF000000</color>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index a1b4810bf..0ba8dc56f 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -336,6 +336,7 @@
     <string name="layout_dazzle"  translatable="false">Dazzle</string>
     <string name="layout_blue_ribbon_high"  translatable="false">Blue Ribbon (High Contrast)</string>
     <string name="layout_dazzle_high"  translatable="false">Dazzle (High Contrast)</string>
+    <string name="layout_gingerbread"  translatable="false">Ginger Bread</string>
 
     <string-array name="keyboard_layout_modes" translatable="false">
         <item>@string/layout_basic</item>
@@ -344,6 +345,7 @@
         <item>@string/layout_blue_ribbon_high</item>
         <item>@string/layout_dazzle</item>
         <item>@string/layout_dazzle_high</item>
+        <item>@string/layout_gingerbread</item>
     </string-array>
 
     <string-array name="keyboard_layout_modes_values" translatable="false">
@@ -353,6 +355,7 @@
         <item>3</item>
         <item>4</item>
         <item>5</item>
+        <item>6</item>
     </string-array>
 
     <string name="prefs_debug_mode">Debug (Temporary)</string>
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 5a271f264..d90261935 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -46,11 +46,11 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
     public static final int KEYBOARDMODE_IM = R.id.mode_im;
     public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
 
-    public static final String DEFAULT_LAYOUT_ID = "3";
+    public static final String DEFAULT_LAYOUT_ID = "6";
     public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout";
     private static final int[] LAYOUTS = new int [] {
         R.layout.input, R.layout.input2, R.layout.input3, R.layout.input4, R.layout.input5,
-        R.layout.input6
+        R.layout.input6, R.layout.input7
     };
 
     private static final int SYMBOLS_MODE_STATE_NONE = 0;
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index ea6b74e1b..c3be252c8 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -677,7 +677,7 @@ public class LatinKeyboard extends Keyboard {
             mTextPaint = new TextPaint();
             int textSize = getTextSizeFromTheme(android.R.style.TextAppearance_Medium, 18);
             mTextPaint.setTextSize(textSize);
-            mTextPaint.setColor(0);
+            mTextPaint.setColor(R.color.latinkeyboard_transparent);
             mTextPaint.setTextAlign(Align.CENTER);
             mTextPaint.setAlpha(255);
             mTextPaint.setAntiAlias(true);