Update OpenWnn to the latest (v133 090930)

Internal issue number: 1981647
author: Daisuke Miyakawa <dmiyakawa@google.com> 2009-10-28 15:39:18 +0900
committer: Daisuke Miyakawa <dmiyakawa@google.com> 2009-10-28 15:39:18 +0900
commit: 0470b8581ba08779a7cc223c050e7b3556891f45 (patch)
tree: 2f04bc96054213ab24178cdc1706f3e1b9309cee
parent: 31d95f0171794861eb8ed43588cca9d72c990cc6 (diff)
download: OpenWnn-0470b8581ba08779a7cc223c050e7b3556891f45.tar.gz
214 files changed, 136 insertions, 224 deletions
diff --git a/NOTICE b/NOTICE
index 1c6236a..828dc84 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,68 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/ 
 
-   Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. 
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. 
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. 
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. 
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. 
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. 
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). 
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. 
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." 
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: 
+You must give any other recipients of the Work or Derivative Works a copy of this License; and 
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and 
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and 
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. 
+
+END OF TERMS AND CONDITIONS 
+APPENDIX: How to apply the Apache License to your work 
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. 
+
+   Copyright [yyyy] [name of copyright owner]
 
    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,
@@ -10,181 +70,3 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/README.txt b/README.txt
index 5ed09c3..53a8d61 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------------
                               OpenWnn Japnese README
 
-                                   Version 1.3.1
+                                   Version 1.3.3
                   
      (C) Copyright OMRON SOFTWARE Co., Ltd. 2008,2009 All Rights Reserved.
 -------------------------------------------------------------------------------
@@ -79,6 +79,8 @@
         drawable/                             |
             *.xml                             |
             *.png                             |
+        drawable-hdpi/                        |
+            *.png                             |
         drawable-ja/                          |
             *.png                             |
         layout/                               |
diff --git a/res/drawable-hdpi/cand_back_normal.9.png b/res/drawable-hdpi/cand_back_normal.9.png
new file mode 100644
index 0000000..c5c8d04
--- /dev/null
+++ b/res/drawable-hdpi/cand_back_normal.9.png
diff --git a/res/drawable-hdpi/cand_back_pressed.9.png b/res/drawable-hdpi/cand_back_pressed.9.png
new file mode 100644
index 0000000..2c4f82c
--- /dev/null
+++ b/res/drawable-hdpi/cand_back_pressed.9.png
diff --git a/res/drawable-hdpi/cand_down.png b/res/drawable-hdpi/cand_down.png
new file mode 100644
index 0000000..4122bdf
--- /dev/null
+++ b/res/drawable-hdpi/cand_down.png
diff --git a/res/drawable-hdpi/cand_down_press.png b/res/drawable-hdpi/cand_down_press.png
new file mode 100644
index 0000000..4d38c28
--- /dev/null
+++ b/res/drawable-hdpi/cand_down_press.png
diff --git a/res/drawable-hdpi/cand_up.png b/res/drawable-hdpi/cand_up.png
new file mode 100644
index 0000000..ce8b563
--- /dev/null
+++ b/res/drawable-hdpi/cand_up.png
diff --git a/res/drawable-hdpi/cand_up_press.png b/res/drawable-hdpi/cand_up_press.png
new file mode 100644
index 0000000..cedbc9f
--- /dev/null
+++ b/res/drawable-hdpi/cand_up_press.png
diff --git a/res/drawable-hdpi/dialog_bubble.9.png b/res/drawable-hdpi/dialog_bubble.9.png
new file mode 100644
index 0000000..83d7ca1
--- /dev/null
+++ b/res/drawable-hdpi/dialog_bubble.9.png
diff --git a/res/drawable-hdpi/dialog_bubble_moji.9.png b/res/drawable-hdpi/dialog_bubble_moji.9.png
new file mode 100644
index 0000000..dfd5998
--- /dev/null
+++ b/res/drawable-hdpi/dialog_bubble_moji.9.png
diff --git a/res/drawable-hdpi/dialog_bubble_symbol.9.png b/res/drawable-hdpi/dialog_bubble_symbol.9.png
new file mode 100644
index 0000000..118ea72
--- /dev/null
+++ b/res/drawable-hdpi/dialog_bubble_symbol.9.png
diff --git a/res/drawable-hdpi/dialog_bubble_undo.9.png b/res/drawable-hdpi/dialog_bubble_undo.9.png
new file mode 100644
index 0000000..a9b9c37
--- /dev/null
+++ b/res/drawable-hdpi/dialog_bubble_undo.9.png
diff --git a/res/drawable-hdpi/immodeic_full_alphabet.png b/res/drawable-hdpi/immodeic_full_alphabet.png
new file mode 100644
index 0000000..3295cd9
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_full_alphabet.png
diff --git a/res/drawable-hdpi/immodeic_full_kana.png b/res/drawable-hdpi/immodeic_full_kana.png
new file mode 100644
index 0000000..14b2275
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_full_kana.png
diff --git a/res/drawable-hdpi/immodeic_full_number.png b/res/drawable-hdpi/immodeic_full_number.png
new file mode 100644
index 0000000..3192910
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_full_number.png
diff --git a/res/drawable-hdpi/immodeic_half_alphabet.png b/res/drawable-hdpi/immodeic_half_alphabet.png
new file mode 100644
index 0000000..34a13cd
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_half_alphabet.png
diff --git a/res/drawable-hdpi/immodeic_half_kana.png b/res/drawable-hdpi/immodeic_half_kana.png
new file mode 100644
index 0000000..d1f4f37
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_half_kana.png
diff --git a/res/drawable-hdpi/immodeic_half_number.png b/res/drawable-hdpi/immodeic_half_number.png
new file mode 100644
index 0000000..8d620e1
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_half_number.png
diff --git a/res/drawable-hdpi/immodeic_hiragana.png b/res/drawable-hdpi/immodeic_hiragana.png
new file mode 100644
index 0000000..7b79230
--- /dev/null
+++ b/res/drawable-hdpi/immodeic_hiragana.png
diff --git a/res/drawable-hdpi/key_12key_alpha0.png b/res/drawable-hdpi/key_12key_alpha0.png
new file mode 100644
index 0000000..e3360d7
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha0.png
diff --git a/res/drawable-hdpi/key_12key_alpha0_b.png b/res/drawable-hdpi/key_12key_alpha0_b.png
new file mode 100644
index 0000000..2392459
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha0_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha1.png b/res/drawable-hdpi/key_12key_alpha1.png
new file mode 100644
index 0000000..559a0d5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha1.png
diff --git a/res/drawable-hdpi/key_12key_alpha1_b.png b/res/drawable-hdpi/key_12key_alpha1_b.png
new file mode 100644
index 0000000..af2466e
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha1_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha2.png b/res/drawable-hdpi/key_12key_alpha2.png
new file mode 100644
index 0000000..970c4e4
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha2.png
diff --git a/res/drawable-hdpi/key_12key_alpha2_b.png b/res/drawable-hdpi/key_12key_alpha2_b.png
new file mode 100644
index 0000000..2dd2897
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha2_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha3.png b/res/drawable-hdpi/key_12key_alpha3.png
new file mode 100644
index 0000000..c4c031f
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha3.png
diff --git a/res/drawable-hdpi/key_12key_alpha3_b.png b/res/drawable-hdpi/key_12key_alpha3_b.png
new file mode 100644
index 0000000..2c12a40
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha3_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha4.png b/res/drawable-hdpi/key_12key_alpha4.png
new file mode 100644
index 0000000..cd4d00c
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha4.png
diff --git a/res/drawable-hdpi/key_12key_alpha4_b.png b/res/drawable-hdpi/key_12key_alpha4_b.png
new file mode 100644
index 0000000..5b98435
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha4_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha5.png b/res/drawable-hdpi/key_12key_alpha5.png
new file mode 100644
index 0000000..9f0e92b
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha5.png
diff --git a/res/drawable-hdpi/key_12key_alpha5_b.png b/res/drawable-hdpi/key_12key_alpha5_b.png
new file mode 100644
index 0000000..f214550
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha5_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha6.png b/res/drawable-hdpi/key_12key_alpha6.png
new file mode 100644
index 0000000..10d970b
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha6.png
diff --git a/res/drawable-hdpi/key_12key_alpha6_b.png b/res/drawable-hdpi/key_12key_alpha6_b.png
new file mode 100644
index 0000000..d3beae0
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha6_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha7.png b/res/drawable-hdpi/key_12key_alpha7.png
new file mode 100644
index 0000000..cbe3cc1
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha7.png
diff --git a/res/drawable-hdpi/key_12key_alpha7_b.png b/res/drawable-hdpi/key_12key_alpha7_b.png
new file mode 100644
index 0000000..6584b60
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha7_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha8.png b/res/drawable-hdpi/key_12key_alpha8.png
new file mode 100644
index 0000000..793c005
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha8.png
diff --git a/res/drawable-hdpi/key_12key_alpha8_b.png b/res/drawable-hdpi/key_12key_alpha8_b.png
new file mode 100644
index 0000000..f8eed53
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha8_b.png
diff --git a/res/drawable-hdpi/key_12key_alpha9.png b/res/drawable-hdpi/key_12key_alpha9.png
new file mode 100644
index 0000000..afb0d92
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha9.png
diff --git a/res/drawable-hdpi/key_12key_alpha9_b.png b/res/drawable-hdpi/key_12key_alpha9_b.png
new file mode 100644
index 0000000..7bdf491
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_alpha9_b.png
diff --git a/res/drawable-hdpi/key_12key_caps.png b/res/drawable-hdpi/key_12key_caps.png
new file mode 100644
index 0000000..a4f2885
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_caps.png
diff --git a/res/drawable-hdpi/key_12key_caps_b.png b/res/drawable-hdpi/key_12key_caps_b.png
new file mode 100644
index 0000000..a4922e5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_caps_b.png
diff --git a/res/drawable-hdpi/key_12key_dakuten.png b/res/drawable-hdpi/key_12key_dakuten.png
new file mode 100644
index 0000000..6bbf010
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_dakuten.png
diff --git a/res/drawable-hdpi/key_12key_dakuten_b.png b/res/drawable-hdpi/key_12key_dakuten_b.png
new file mode 100644
index 0000000..d6e7505
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_dakuten_b.png
diff --git a/res/drawable-hdpi/key_12key_del.png b/res/drawable-hdpi/key_12key_del.png
new file mode 100644
index 0000000..fda82fa
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_del.png
diff --git a/res/drawable-hdpi/key_12key_del_b.png b/res/drawable-hdpi/key_12key_del_b.png
new file mode 100644
index 0000000..e93f2e0
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_del_b.png
diff --git a/res/drawable-hdpi/key_12key_del_b_landscape.png b/res/drawable-hdpi/key_12key_del_b_landscape.png
new file mode 100644
index 0000000..e183c93
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_del_b_landscape.png
diff --git a/res/drawable-hdpi/key_12key_del_landscape.png b/res/drawable-hdpi/key_12key_del_landscape.png
new file mode 100644
index 0000000..b227fd4
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_del_landscape.png
diff --git a/res/drawable-hdpi/key_12key_eisukana.png b/res/drawable-hdpi/key_12key_eisukana.png
new file mode 100644
index 0000000..0cb9637
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_eisukana.png
diff --git a/res/drawable-hdpi/key_12key_eisukana_b.png b/res/drawable-hdpi/key_12key_eisukana_b.png
new file mode 100644
index 0000000..d6d8d30
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_eisukana_b.png
diff --git a/res/drawable-hdpi/key_12key_enter.png b/res/drawable-hdpi/key_12key_enter.png
new file mode 100644
index 0000000..4dae5b6
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter.png
diff --git a/res/drawable-hdpi/key_12key_enter_b.png b/res/drawable-hdpi/key_12key_enter_b.png
new file mode 100644
index 0000000..6899036
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_b.png
diff --git a/res/drawable-hdpi/key_12key_enter_jp.png b/res/drawable-hdpi/key_12key_enter_jp.png
new file mode 100644
index 0000000..59ccc07
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_jp.png
diff --git a/res/drawable-hdpi/key_12key_enter_jp_b.png b/res/drawable-hdpi/key_12key_enter_jp_b.png
new file mode 100644
index 0000000..3bb83f4
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_jp_b.png
diff --git a/res/drawable-hdpi/key_12key_enter_landscape.png b/res/drawable-hdpi/key_12key_enter_landscape.png
new file mode 100644
index 0000000..9bf47ab
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_landscape.png
diff --git a/res/drawable-hdpi/key_12key_enter_landscape_b.png b/res/drawable-hdpi/key_12key_enter_landscape_b.png
new file mode 100644
index 0000000..98b2d99
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_landscape_b.png
diff --git a/res/drawable-hdpi/key_12key_enter_landscape_jp.png b/res/drawable-hdpi/key_12key_enter_landscape_jp.png
new file mode 100644
index 0000000..fd98c6b
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_landscape_jp.png
diff --git a/res/drawable-hdpi/key_12key_enter_landscape_jp_b.png b/res/drawable-hdpi/key_12key_enter_landscape_jp_b.png
new file mode 100644
index 0000000..af60064
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_enter_landscape_jp_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana0.png b/res/drawable-hdpi/key_12key_hiragana0.png
new file mode 100644
index 0000000..eb25b1c
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana0.png
diff --git a/res/drawable-hdpi/key_12key_hiragana0_b.png b/res/drawable-hdpi/key_12key_hiragana0_b.png
new file mode 100644
index 0000000..2144788
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana0_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana1.png b/res/drawable-hdpi/key_12key_hiragana1.png
new file mode 100644
index 0000000..32b51fa
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana1.png
diff --git a/res/drawable-hdpi/key_12key_hiragana1_b.png b/res/drawable-hdpi/key_12key_hiragana1_b.png
new file mode 100644
index 0000000..f5f21f0
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana1_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana2.png b/res/drawable-hdpi/key_12key_hiragana2.png
new file mode 100644
index 0000000..f9ba3c6
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana2.png
diff --git a/res/drawable-hdpi/key_12key_hiragana2_b.png b/res/drawable-hdpi/key_12key_hiragana2_b.png
new file mode 100644
index 0000000..d12cb7c
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana2_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana3.png b/res/drawable-hdpi/key_12key_hiragana3.png
new file mode 100644
index 0000000..0b68d99
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana3.png
diff --git a/res/drawable-hdpi/key_12key_hiragana3_b.png b/res/drawable-hdpi/key_12key_hiragana3_b.png
new file mode 100644
index 0000000..13f7c56
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana3_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana4.png b/res/drawable-hdpi/key_12key_hiragana4.png
new file mode 100644
index 0000000..5e8a855
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana4.png
diff --git a/res/drawable-hdpi/key_12key_hiragana4_b.png b/res/drawable-hdpi/key_12key_hiragana4_b.png
new file mode 100644
index 0000000..3b9e352
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana4_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana5.png b/res/drawable-hdpi/key_12key_hiragana5.png
new file mode 100644
index 0000000..8c9361e
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana5.png
diff --git a/res/drawable-hdpi/key_12key_hiragana5_b.png b/res/drawable-hdpi/key_12key_hiragana5_b.png
new file mode 100644
index 0000000..616b43d
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana5_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana6.png b/res/drawable-hdpi/key_12key_hiragana6.png
new file mode 100644
index 0000000..4912b4f
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana6.png
diff --git a/res/drawable-hdpi/key_12key_hiragana6_b.png b/res/drawable-hdpi/key_12key_hiragana6_b.png
new file mode 100644
index 0000000..e92957a
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana6_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana7.png b/res/drawable-hdpi/key_12key_hiragana7.png
new file mode 100644
index 0000000..dbc5bc3
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana7.png
diff --git a/res/drawable-hdpi/key_12key_hiragana7_b.png b/res/drawable-hdpi/key_12key_hiragana7_b.png
new file mode 100644
index 0000000..2eab3f6
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana7_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana8.png b/res/drawable-hdpi/key_12key_hiragana8.png
new file mode 100644
index 0000000..63e02c9
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana8.png
diff --git a/res/drawable-hdpi/key_12key_hiragana8_b.png b/res/drawable-hdpi/key_12key_hiragana8_b.png
new file mode 100644
index 0000000..9389ced
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana8_b.png
diff --git a/res/drawable-hdpi/key_12key_hiragana9.png b/res/drawable-hdpi/key_12key_hiragana9.png
new file mode 100644
index 0000000..76fcf40
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana9.png
diff --git a/res/drawable-hdpi/key_12key_hiragana9_b.png b/res/drawable-hdpi/key_12key_hiragana9_b.png
new file mode 100644
index 0000000..15471e6
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_hiragana9_b.png
diff --git a/res/drawable-hdpi/key_12key_left.png b/res/drawable-hdpi/key_12key_left.png
new file mode 100644
index 0000000..8adfc19
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_left.png
diff --git a/res/drawable-hdpi/key_12key_left_b.png b/res/drawable-hdpi/key_12key_left_b.png
new file mode 100644
index 0000000..767f2d4
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_left_b.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_alpha.png b/res/drawable-hdpi/key_12key_mode_full_alpha.png
new file mode 100644
index 0000000..c875bf5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_alpha.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_alpha_landscape.png b/res/drawable-hdpi/key_12key_mode_full_alpha_landscape.png
new file mode 100644
index 0000000..927d56b
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_alpha_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_kata.png b/res/drawable-hdpi/key_12key_mode_full_kata.png
new file mode 100644
index 0000000..6786f1c
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_kata.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_kata_landscape.png b/res/drawable-hdpi/key_12key_mode_full_kata_landscape.png
new file mode 100644
index 0000000..edd502c
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_kata_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_num.png b/res/drawable-hdpi/key_12key_mode_full_num.png
new file mode 100644
index 0000000..d0699b5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_num.png
diff --git a/res/drawable-hdpi/key_12key_mode_full_num_landscape.png b/res/drawable-hdpi/key_12key_mode_full_num_landscape.png
new file mode 100644
index 0000000..7e286c5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_full_num_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_alpha.png b/res/drawable-hdpi/key_12key_mode_half_alpha.png
new file mode 100644
index 0000000..3f6d081
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_alpha.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_alpha_landscape.png b/res/drawable-hdpi/key_12key_mode_half_alpha_landscape.png
new file mode 100644
index 0000000..c6f5245
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_alpha_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_kata.png b/res/drawable-hdpi/key_12key_mode_half_kata.png
new file mode 100644
index 0000000..296731a
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_kata.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_kata_landscape.png b/res/drawable-hdpi/key_12key_mode_half_kata_landscape.png
new file mode 100644
index 0000000..c8acb6d
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_kata_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_num.png b/res/drawable-hdpi/key_12key_mode_half_num.png
new file mode 100644
index 0000000..6172775
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_num.png
diff --git a/res/drawable-hdpi/key_12key_mode_half_num_landscape.png b/res/drawable-hdpi/key_12key_mode_half_num_landscape.png
new file mode 100644
index 0000000..fb2f61a
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_half_num_landscape.png
diff --git a/res/drawable-hdpi/key_12key_mode_hira.png b/res/drawable-hdpi/key_12key_mode_hira.png
new file mode 100644
index 0000000..ea62e79
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_hira.png
diff --git a/res/drawable-hdpi/key_12key_mode_hira_landscape.png b/res/drawable-hdpi/key_12key_mode_hira_landscape.png
new file mode 100644
index 0000000..9fd9d08
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_mode_hira_landscape.png
diff --git a/res/drawable-hdpi/key_12key_period_comma.png b/res/drawable-hdpi/key_12key_period_comma.png
new file mode 100644
index 0000000..8a4c7fc
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_period_comma.png
diff --git a/res/drawable-hdpi/key_12key_period_comma_b.png b/res/drawable-hdpi/key_12key_period_comma_b.png
new file mode 100644
index 0000000..29fc223
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_period_comma_b.png
diff --git a/res/drawable-hdpi/key_12key_pict_sym.png b/res/drawable-hdpi/key_12key_pict_sym.png
new file mode 100644
index 0000000..1121b98
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_pict_sym.png
diff --git a/res/drawable-hdpi/key_12key_pict_sym_b.png b/res/drawable-hdpi/key_12key_pict_sym_b.png
new file mode 100644
index 0000000..a97c9cf
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_pict_sym_b.png
diff --git a/res/drawable-hdpi/key_12key_reverse.png b/res/drawable-hdpi/key_12key_reverse.png
new file mode 100644
index 0000000..f1e18c3
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_reverse.png
diff --git a/res/drawable-hdpi/key_12key_reverse_b.png b/res/drawable-hdpi/key_12key_reverse_b.png
new file mode 100644
index 0000000..184c694
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_reverse_b.png
diff --git a/res/drawable-hdpi/key_12key_right.png b/res/drawable-hdpi/key_12key_right.png
new file mode 100644
index 0000000..8cb8ee9
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_right.png
diff --git a/res/drawable-hdpi/key_12key_right_b.png b/res/drawable-hdpi/key_12key_right_b.png
new file mode 100644
index 0000000..61402c5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_right_b.png
diff --git a/res/drawable-hdpi/key_12key_space.png b/res/drawable-hdpi/key_12key_space.png
new file mode 100644
index 0000000..5ddbc1e
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_space.png
diff --git a/res/drawable-hdpi/key_12key_space_b.png b/res/drawable-hdpi/key_12key_space_b.png
new file mode 100644
index 0000000..d51f357
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_space_b.png
diff --git a/res/drawable-hdpi/key_12key_space_jp.png b/res/drawable-hdpi/key_12key_space_jp.png
new file mode 100644
index 0000000..22932e5
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_space_jp.png
diff --git a/res/drawable-hdpi/key_12key_space_jp_b.png b/res/drawable-hdpi/key_12key_space_jp_b.png
new file mode 100644
index 0000000..54e8b19
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_space_jp_b.png
diff --git a/res/drawable-hdpi/key_12key_ten.png b/res/drawable-hdpi/key_12key_ten.png
new file mode 100644
index 0000000..62f6fc4
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_ten.png
diff --git a/res/drawable-hdpi/key_12key_ten_b.png b/res/drawable-hdpi/key_12key_ten_b.png
new file mode 100644
index 0000000..a6a4d37
--- /dev/null
+++ b/res/drawable-hdpi/key_12key_ten_b.png
diff --git a/res/drawable-hdpi/key_mode_change_b.png b/res/drawable-hdpi/key_mode_change_b.png
new file mode 100644
index 0000000..24abfd4
--- /dev/null
+++ b/res/drawable-hdpi/key_mode_change_b.png
diff --git a/res/drawable-hdpi/key_mode_panel_kbd.png b/res/drawable-hdpi/key_mode_panel_kbd.png
new file mode 100644
index 0000000..d088f97
--- /dev/null
+++ b/res/drawable-hdpi/key_mode_panel_kbd.png
diff --git a/res/drawable-hdpi/key_mode_panel_kbd_12key.png b/res/drawable-hdpi/key_mode_panel_kbd_12key.png
new file mode 100644
index 0000000..2ed8f3d
--- /dev/null
+++ b/res/drawable-hdpi/key_mode_panel_kbd_12key.png
diff --git a/res/drawable-hdpi/key_mode_panel_kbd_12key_b.png b/res/drawable-hdpi/key_mode_panel_kbd_12key_b.png
new file mode 100644
index 0000000..7b0f7f0
--- /dev/null
+++ b/res/drawable-hdpi/key_mode_panel_kbd_12key_b.png
diff --git a/res/drawable-hdpi/key_mode_panel_kbd_b.png b/res/drawable-hdpi/key_mode_panel_kbd_b.png
new file mode 100644
index 0000000..468cda7
--- /dev/null
+++ b/res/drawable-hdpi/key_mode_panel_kbd_b.png
diff --git a/res/drawable-hdpi/key_qwerty_del.png b/res/drawable-hdpi/key_qwerty_del.png
new file mode 100644
index 0000000..c02e66c
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_del.png
diff --git a/res/drawable-hdpi/key_qwerty_del_b.png b/res/drawable-hdpi/key_qwerty_del_b.png
new file mode 100644
index 0000000..df084c1
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_del_b.png
diff --git a/res/drawable-hdpi/key_qwerty_del_b_landscape.png b/res/drawable-hdpi/key_qwerty_del_b_landscape.png
new file mode 100644
index 0000000..db71256
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_del_b_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_del_landscape.png b/res/drawable-hdpi/key_qwerty_del_landscape.png
new file mode 100644
index 0000000..2855634
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_del_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_enter.png b/res/drawable-hdpi/key_qwerty_enter.png
new file mode 100644
index 0000000..6243499
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_b.png b/res/drawable-hdpi/key_qwerty_enter_b.png
new file mode 100644
index 0000000..2d38865
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_b.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_jp.png b/res/drawable-hdpi/key_qwerty_enter_jp.png
new file mode 100644
index 0000000..54c82b5
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_jp.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_jp_b.png b/res/drawable-hdpi/key_qwerty_enter_jp_b.png
new file mode 100644
index 0000000..b2fad3e
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_jp_b.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_landscape.png b/res/drawable-hdpi/key_qwerty_enter_landscape.png
new file mode 100644
index 0000000..fd0231c
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_landscape_b.png b/res/drawable-hdpi/key_qwerty_enter_landscape_b.png
new file mode 100644
index 0000000..574c896
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_landscape_b.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_landscape_jp.png b/res/drawable-hdpi/key_qwerty_enter_landscape_jp.png
new file mode 100644
index 0000000..bb9d835
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_landscape_jp.png
diff --git a/res/drawable-hdpi/key_qwerty_enter_landscape_jp_b.png b/res/drawable-hdpi/key_qwerty_enter_landscape_jp_b.png
new file mode 100644
index 0000000..a43e717
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_enter_landscape_jp_b.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_alpha.png b/res/drawable-hdpi/key_qwerty_mode_full_alpha.png
new file mode 100644
index 0000000..004cd36
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_alpha.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_alpha_landscape.png b/res/drawable-hdpi/key_qwerty_mode_full_alpha_landscape.png
new file mode 100644
index 0000000..a7152ad
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_alpha_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_kata.png b/res/drawable-hdpi/key_qwerty_mode_full_kata.png
new file mode 100644
index 0000000..1a37099
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_kata.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_kata_landscape.png b/res/drawable-hdpi/key_qwerty_mode_full_kata_landscape.png
new file mode 100644
index 0000000..d3a537e
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_kata_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_num.png b/res/drawable-hdpi/key_qwerty_mode_full_num.png
new file mode 100644
index 0000000..442b93d
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_num.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_full_num_landscape.png b/res/drawable-hdpi/key_qwerty_mode_full_num_landscape.png
new file mode 100644
index 0000000..b0e530e
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_full_num_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_alpha.png b/res/drawable-hdpi/key_qwerty_mode_half_alpha.png
new file mode 100644
index 0000000..7d58689
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_alpha.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_alpha_landscape.png b/res/drawable-hdpi/key_qwerty_mode_half_alpha_landscape.png
new file mode 100644
index 0000000..f87d42b
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_alpha_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_kata.png b/res/drawable-hdpi/key_qwerty_mode_half_kata.png
new file mode 100644
index 0000000..4c219a3
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_kata.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_kata_landscape.png b/res/drawable-hdpi/key_qwerty_mode_half_kata_landscape.png
new file mode 100644
index 0000000..05eee0a
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_kata_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_num.png b/res/drawable-hdpi/key_qwerty_mode_half_num.png
new file mode 100644
index 0000000..a181e33
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_num.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_half_num_landscape.png b/res/drawable-hdpi/key_qwerty_mode_half_num_landscape.png
new file mode 100644
index 0000000..2aec40b
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_half_num_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_hira.png b/res/drawable-hdpi/key_qwerty_mode_hira.png
new file mode 100644
index 0000000..077d7da
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_hira.png
diff --git a/res/drawable-hdpi/key_qwerty_mode_hira_landscape.png b/res/drawable-hdpi/key_qwerty_mode_hira_landscape.png
new file mode 100644
index 0000000..5d3fd29
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_mode_hira_landscape.png
diff --git a/res/drawable-hdpi/key_qwerty_pict_sym.png b/res/drawable-hdpi/key_qwerty_pict_sym.png
new file mode 100644
index 0000000..276fc9d
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_pict_sym.png
diff --git a/res/drawable-hdpi/key_qwerty_pict_sym_b.png b/res/drawable-hdpi/key_qwerty_pict_sym_b.png
new file mode 100644
index 0000000..43472f2
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_pict_sym_b.png
diff --git a/res/drawable-hdpi/key_qwerty_shift.png b/res/drawable-hdpi/key_qwerty_shift.png
new file mode 100644
index 0000000..8d9d8ed
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_shift.png
diff --git a/res/drawable-hdpi/key_qwerty_shift_b.png b/res/drawable-hdpi/key_qwerty_shift_b.png
new file mode 100644
index 0000000..73cbec8
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_shift_b.png
diff --git a/res/drawable-hdpi/key_qwerty_space.png b/res/drawable-hdpi/key_qwerty_space.png
new file mode 100644
index 0000000..a9bbdbe
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_space.png
diff --git a/res/drawable-hdpi/key_qwerty_space_b.png b/res/drawable-hdpi/key_qwerty_space_b.png
new file mode 100644
index 0000000..0cbaf57
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_space_b.png
diff --git a/res/drawable-hdpi/key_qwerty_space_conv.png b/res/drawable-hdpi/key_qwerty_space_conv.png
new file mode 100644
index 0000000..e120c85
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_space_conv.png
diff --git a/res/drawable-hdpi/key_qwerty_space_conv_b.png b/res/drawable-hdpi/key_qwerty_space_conv_b.png
new file mode 100644
index 0000000..f79e545
--- /dev/null
+++ b/res/drawable-hdpi/key_qwerty_space_conv_b.png
diff --git a/res/drawable-hdpi/keybg_classic.9.png b/res/drawable-hdpi/keybg_classic.9.png
new file mode 100644
index 0000000..47a9963
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic.9.png
diff --git a/res/drawable-hdpi/keybg_classic_bg.png b/res/drawable-hdpi/keybg_classic_bg.png
new file mode 100644
index 0000000..cc1fabc
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_bg.png
diff --git a/res/drawable-hdpi/keybg_classic_p.9.png b/res/drawable-hdpi/keybg_classic_p.9.png
new file mode 100644
index 0000000..e5b4362
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_p.9.png
diff --git a/res/drawable-hdpi/keybg_classic_psftoff.9.png b/res/drawable-hdpi/keybg_classic_psftoff.9.png
new file mode 100644
index 0000000..e287e7d
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_classic_psfton.9.png b/res/drawable-hdpi/keybg_classic_psfton.9.png
new file mode 100644
index 0000000..c40a64f
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_classic_sftoff.9.png b/res/drawable-hdpi/keybg_classic_sftoff.9.png
new file mode 100644
index 0000000..b8a79bb
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_classic_sfton.9.png b/res/drawable-hdpi/keybg_classic_sfton.9.png
new file mode 100644
index 0000000..23d9fc1
--- /dev/null
+++ b/res/drawable-hdpi/keybg_classic_sfton.9.png
diff --git a/res/drawable-hdpi/keybg_ice.9.png b/res/drawable-hdpi/keybg_ice.9.png
new file mode 100644
index 0000000..7a815d0
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice.9.png
diff --git a/res/drawable-hdpi/keybg_ice_p.9.png b/res/drawable-hdpi/keybg_ice_p.9.png
new file mode 100644
index 0000000..5feea7d
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice_p.9.png
diff --git a/res/drawable-hdpi/keybg_ice_psftoff.9.png b/res/drawable-hdpi/keybg_ice_psftoff.9.png
new file mode 100644
index 0000000..f5c707f
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_ice_psfton.9.png b/res/drawable-hdpi/keybg_ice_psfton.9.png
new file mode 100644
index 0000000..8cc0edd
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_ice_sftoff.9.png b/res/drawable-hdpi/keybg_ice_sftoff.9.png
new file mode 100644
index 0000000..e1b1b8f
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_ice_sfton.9.png b/res/drawable-hdpi/keybg_ice_sfton.9.png
new file mode 100644
index 0000000..dca44fc
--- /dev/null
+++ b/res/drawable-hdpi/keybg_ice_sfton.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto.9.png b/res/drawable-hdpi/keybg_kyoto.9.png
new file mode 100644
index 0000000..d4dd8da
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto_bg.png b/res/drawable-hdpi/keybg_kyoto_bg.png
new file mode 100644
index 0000000..e52d72b
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_bg.png
diff --git a/res/drawable-hdpi/keybg_kyoto_p.9.png b/res/drawable-hdpi/keybg_kyoto_p.9.png
new file mode 100644
index 0000000..17ac156
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_p.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto_psftoff.9.png b/res/drawable-hdpi/keybg_kyoto_psftoff.9.png
new file mode 100644
index 0000000..d7cdefc
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto_psfton.9.png b/res/drawable-hdpi/keybg_kyoto_psfton.9.png
new file mode 100644
index 0000000..6b9cb6e
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto_sftoff.9.png b/res/drawable-hdpi/keybg_kyoto_sftoff.9.png
new file mode 100644
index 0000000..c334743
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_kyoto_sfton.9.png b/res/drawable-hdpi/keybg_kyoto_sfton.9.png
new file mode 100644
index 0000000..7e64bae
--- /dev/null
+++ b/res/drawable-hdpi/keybg_kyoto_sfton.9.png
diff --git a/res/drawable-hdpi/keybg_light.9.png b/res/drawable-hdpi/keybg_light.9.png
new file mode 100644
index 0000000..d778616
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light.9.png
diff --git a/res/drawable-hdpi/keybg_light_p.9.png b/res/drawable-hdpi/keybg_light_p.9.png
new file mode 100644
index 0000000..8c62ee7
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light_p.9.png
diff --git a/res/drawable-hdpi/keybg_light_psftoff.9.png b/res/drawable-hdpi/keybg_light_psftoff.9.png
new file mode 100644
index 0000000..2205548
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_light_psfton.9.png b/res/drawable-hdpi/keybg_light_psfton.9.png
new file mode 100644
index 0000000..a96d216
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_light_sftoff.9.png b/res/drawable-hdpi/keybg_light_sftoff.9.png
new file mode 100644
index 0000000..3bfbc8a
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_light_sfton.9.png b/res/drawable-hdpi/keybg_light_sfton.9.png
new file mode 100644
index 0000000..cac58cd
--- /dev/null
+++ b/res/drawable-hdpi/keybg_light_sfton.9.png
diff --git a/res/drawable-hdpi/keybg_metal.png b/res/drawable-hdpi/keybg_metal.png
new file mode 100644
index 0000000..401177d
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal.png
diff --git a/res/drawable-hdpi/keybg_metal_p.png b/res/drawable-hdpi/keybg_metal_p.png
new file mode 100644
index 0000000..4d9dd5d
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal_p.png
diff --git a/res/drawable-hdpi/keybg_metal_psftoff.png b/res/drawable-hdpi/keybg_metal_psftoff.png
new file mode 100644
index 0000000..9d5a3ed
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal_psftoff.png
diff --git a/res/drawable-hdpi/keybg_metal_psfton.png b/res/drawable-hdpi/keybg_metal_psfton.png
new file mode 100644
index 0000000..fb20e0c
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal_psfton.png
diff --git a/res/drawable-hdpi/keybg_metal_sftoff.png b/res/drawable-hdpi/keybg_metal_sftoff.png
new file mode 100644
index 0000000..146d275
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal_sftoff.png
diff --git a/res/drawable-hdpi/keybg_metal_sfton.png b/res/drawable-hdpi/keybg_metal_sfton.png
new file mode 100644
index 0000000..4f766f4
--- /dev/null
+++ b/res/drawable-hdpi/keybg_metal_sfton.png
diff --git a/res/drawable-hdpi/keybg_simple.9.png b/res/drawable-hdpi/keybg_simple.9.png
new file mode 100644
index 0000000..55fb17c
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple.9.png
diff --git a/res/drawable-hdpi/keybg_simple_bg.png b/res/drawable-hdpi/keybg_simple_bg.png
new file mode 100644
index 0000000..f4925c4
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_bg.png
diff --git a/res/drawable-hdpi/keybg_simple_p.9.png b/res/drawable-hdpi/keybg_simple_p.9.png
new file mode 100644
index 0000000..0abf360
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_p.9.png
diff --git a/res/drawable-hdpi/keybg_simple_psftoff.9.png b/res/drawable-hdpi/keybg_simple_psftoff.9.png
new file mode 100644
index 0000000..b61c2d0
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_simple_psfton.9.png b/res/drawable-hdpi/keybg_simple_psfton.9.png
new file mode 100644
index 0000000..5015ae7
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_simple_sftoff.9.png b/res/drawable-hdpi/keybg_simple_sftoff.9.png
new file mode 100644
index 0000000..3377b5b
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_simple_sfton.9.png b/res/drawable-hdpi/keybg_simple_sfton.9.png
new file mode 100644
index 0000000..7676ca6
--- /dev/null
+++ b/res/drawable-hdpi/keybg_simple_sfton.9.png
diff --git a/res/drawable-hdpi/keybg_wood.9.png b/res/drawable-hdpi/keybg_wood.9.png
new file mode 100644
index 0000000..f5924ba
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood.9.png
diff --git a/res/drawable-hdpi/keybg_wood_bg.png b/res/drawable-hdpi/keybg_wood_bg.png
new file mode 100644
index 0000000..2134f07
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_bg.png
diff --git a/res/drawable-hdpi/keybg_wood_p.9.png b/res/drawable-hdpi/keybg_wood_p.9.png
new file mode 100644
index 0000000..1b1d227
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_p.9.png
diff --git a/res/drawable-hdpi/keybg_wood_psftoff.9.png b/res/drawable-hdpi/keybg_wood_psftoff.9.png
new file mode 100644
index 0000000..4c31234
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_psftoff.9.png
diff --git a/res/drawable-hdpi/keybg_wood_psfton.9.png b/res/drawable-hdpi/keybg_wood_psfton.9.png
new file mode 100644
index 0000000..140bc83
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_psfton.9.png
diff --git a/res/drawable-hdpi/keybg_wood_sftoff.9.png b/res/drawable-hdpi/keybg_wood_sftoff.9.png
new file mode 100644
index 0000000..b3240a8
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_sftoff.9.png
diff --git a/res/drawable-hdpi/keybg_wood_sfton.9.png b/res/drawable-hdpi/keybg_wood_sfton.9.png
new file mode 100644
index 0000000..c43252f
--- /dev/null
+++ b/res/drawable-hdpi/keybg_wood_sfton.9.png
diff --git a/res/drawable-hdpi/tutorial_12key_enter.png b/res/drawable-hdpi/tutorial_12key_enter.png
new file mode 100644
index 0000000..283883f
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_enter.png
diff --git a/res/drawable-hdpi/tutorial_12key_key.png b/res/drawable-hdpi/tutorial_12key_key.png
new file mode 100644
index 0000000..c6d81a4
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_key.png
diff --git a/res/drawable-hdpi/tutorial_12key_left.png b/res/drawable-hdpi/tutorial_12key_left.png
new file mode 100644
index 0000000..c25df43
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_left.png
diff --git a/res/drawable-hdpi/tutorial_12key_mode.png b/res/drawable-hdpi/tutorial_12key_mode.png
new file mode 100644
index 0000000..05066f9
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_mode.png
diff --git a/res/drawable-hdpi/tutorial_12key_right.png b/res/drawable-hdpi/tutorial_12key_right.png
new file mode 100644
index 0000000..be763a3
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_right.png
diff --git a/res/drawable-hdpi/tutorial_12key_space_jp.png b/res/drawable-hdpi/tutorial_12key_space_jp.png
new file mode 100644
index 0000000..85a69b9
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_space_jp.png
diff --git a/res/drawable-hdpi/tutorial_12key_toggle.png b/res/drawable-hdpi/tutorial_12key_toggle.png
new file mode 100644
index 0000000..03da7e8
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_12key_toggle.png
diff --git a/res/drawable-hdpi/tutorial_back.png b/res/drawable-hdpi/tutorial_back.png
new file mode 100644
index 0000000..aaf0686
--- /dev/null
+++ b/res/drawable-hdpi/tutorial_back.png
diff --git a/res/drawable-hdpi/word_full_space.png b/res/drawable-hdpi/word_full_space.png
new file mode 100644
index 0000000..8822078
--- /dev/null
+++ b/res/drawable-hdpi/word_full_space.png
diff --git a/res/drawable-hdpi/word_half_space.png b/res/drawable-hdpi/word_half_space.png
new file mode 100644
index 0000000..3a521ee
--- /dev/null
+++ b/res/drawable-hdpi/word_half_space.png
diff --git a/res/drawable-ja/tutorial_12key_key.png b/res/drawable-ja/tutorial_12key_key.png
new file mode 100644
index 0000000..872f138
--- /dev/null
+++ b/res/drawable-ja/tutorial_12key_key.png
diff --git a/res/drawable-ja/tutorial_12key_mode.png b/res/drawable-ja/tutorial_12key_mode.png
new file mode 100644
index 0000000..d287c13
--- /dev/null
+++ b/res/drawable-ja/tutorial_12key_mode.png
diff --git a/res/drawable-ja/tutorial_12key_toggle.png b/res/drawable-ja/tutorial_12key_toggle.png
new file mode 100644
index 0000000..f9cbcb8
--- /dev/null
+++ b/res/drawable-ja/tutorial_12key_toggle.png
diff --git a/res/layout/candidates.xml b/res/layout/candidates.xml
index a5b638c..d5009df 100644
--- a/res/layout/candidates.xml
+++ b/res/layout/candidates.xml
@@ -47,7 +47,7 @@
          android:layout_height="wrap_content"
          android:background="@color/candidate_back"
          />
-      <RelativeLayout 
+      <AbsoluteLayout
          android:id="@+id/candidates_2nd_view"
          android:layout_width="fill_parent" 
          android:layout_height="wrap_content"
diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml
index ccbbd98..7f1b283 100644
--- a/res/values-ja/string.xml
+++ b/res/values-ja/string.xml
@@ -103,13 +103,13 @@
 
   <!-- IME dependency -->
     <!-- OpenWnn English -->
-    <string name="openwnn_english_copyright">Ver.1.3.1\nオムロン ソフトウェア(株)</string>
+    <string name="openwnn_english_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
 
     <!-- OpenWnn Japanese -->
-    <string name="openwnn_japanese_copyright">Ver.1.3.1\nオムロン ソフトウェア(株)</string>
+    <string name="openwnn_japanese_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
 
     <!-- OpenWnn Chinese -->
-    <string name="openwnn_china_copyright">Ver.1.3.1\nオムロン ソフトウェア(株)</string>
+    <string name="openwnn_china_copyright">Ver.1.3.3\nオムロン ソフトウェア(株)</string>
 
   <!-- Candidate Delete -->
       <string name="button_candidate_select">選　択</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59f22ce..48793b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,12 +16,6 @@
 -->
 <resources>
   <!-- common part -->
-    <!-- Engine -->
-    <string name="openwnn_system_dictionary_japanese">/data/data/jp.co.omronsoft.openwnn/lib/libWnnJpnDic.so</string>
-    <string name="openwnn_writable_dictionary_japanese">/data/data/jp.co.omronsoft.openwnn/writableJAJP.dic</string>
-    <string name="openwnn_system_dictionary_english">/data/data/jp.co.omronsoft.openwnn/lib/libWnnEngDic.so</string>
-    <string name="openwnn_writable_dictionary_english">/data/data/jp.co.omronsoft.openwnn/writableEN.dic</string>
-
     <!-- Preferences -->
     <string name="preference_ime_setting_app">Setting</string>
 
@@ -111,20 +105,20 @@
 
   <!-- IME dependency -->
     <!-- OpenWnn English -->
-    <string name="openwnn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.</string>
+    <string name="openwnn_english_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
     <string name="openwnn_english">OpenWnn English</string>
     <string name="openwnn_english_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnEngDic.so</string>
     <string name="openwnn_english_writable_dictionary">/data/data/jp.co.omronsoft.openwnn/writableEN.dic</string>
     <string name="en_word_separators">.,;:!?</string>
 
     <!-- OpenWnn Japanese -->
-    <string name="openwnn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.</string>
+    <string name="openwnn_japanese_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
     <string name="openwnn_japanese">Japanese IME</string>
     <string name="openwnn_japanese_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnJpnDic.so</string>
     <string name="openwnn_japanese_writable_dictionary">/data/data/jp.co.omronsoft.openwnn/writableJAJP.dic</string>
 
     <!-- OpenWnn Chinese -->
-    <string name="openwnn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.</string>
+    <string name="openwnn_china_copyright">Ver.1.3.3\nOMRON SOFTWARE Co., Ltd.</string>
     <string name="openwnn_china">OpenWnn Chinese</string>
     <string name="openwnn_china_system_dictionary">/data/data/jp.co.omronsoft.openwnn/lib/libWnnZHCNDic.so</string>
 <!-- After Config Change -->
diff --git a/src/jp/co/omronsoft/openwnn/JAJP/DefaultSoftKeyboardJAJP.java b/src/jp/co/omronsoft/openwnn/JAJP/DefaultSoftKeyboardJAJP.java
index de9f431..b01b629 100644
--- a/src/jp/co/omronsoft/openwnn/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/jp/co/omronsoft/openwnn/JAJP/DefaultSoftKeyboardJAJP.java
@@ -734,12 +734,11 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
             switch (inputType & EditorInfo.TYPE_MASK_VARIATION) {
 
             case EditorInfo.TYPE_TEXT_VARIATION_PASSWORD:
+            case EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
                 mLimitedKeyMode = new int[] {KEYMODE_JA_HALF_ALPHABET, KEYMODE_JA_HALF_NUMBER};
                 break;
 
             case EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS:
-                mLimitedKeyMode = new int[] {KEYMODE_JA_HALF_ALPHABET, KEYMODE_JA_HALF_NUMBER};
-                break;
             case EditorInfo.TYPE_TEXT_VARIATION_URI:
                 mPreferenceKeyMode = KEYMODE_JA_HALF_ALPHABET;
                 break;
diff --git a/src/jp/co/omronsoft/openwnn/OpenWnnEN.java b/src/jp/co/omronsoft/openwnn/OpenWnnEN.java
index 9801849..028daec 100644
--- a/src/jp/co/omronsoft/openwnn/OpenWnnEN.java
+++ b/src/jp/co/omronsoft/openwnn/OpenWnnEN.java
@@ -520,8 +520,13 @@ public class OpenWnnEN extends OpenWnn {
             updateComposingText(1);
             ret = processKeyEvent(ev.keyEvent);
             if (!ret) {
-                mInputConnection.sendKeyEvent(ev.keyEvent);
-                mInputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, ev.keyEvent.getKeyCode()));
+            	int code = keyEvent.getKeyCode();
+            	if (code == KeyEvent.KEYCODE_ENTER) {
+                    sendKeyChar('\n');
+            	} else {
+                    mInputConnection.sendKeyEvent(keyEvent);
+                    mInputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, code));
+            	}
                 ret = true;
             }
             mPreviousEventCode = ev.code;
@@ -977,7 +982,7 @@ public class OpenWnnEN extends OpenWnn {
         case EditorInfo.TYPE_CLASS_TEXT:
             switch (info.inputType & EditorInfo.TYPE_MASK_VARIATION) {
             case EditorInfo.TYPE_TEXT_VARIATION_PASSWORD:
-                mEnableAutoHideKeyboard = true;
+            case EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
                 mOptLearning = false;
                 mOptPrediction = false;
                 break;
diff --git a/src/jp/co/omronsoft/openwnn/OpenWnnJAJP.java b/src/jp/co/omronsoft/openwnn/OpenWnnJAJP.java
index 91fff14..b93c837 100644
--- a/src/jp/co/omronsoft/openwnn/OpenWnnJAJP.java
+++ b/src/jp/co/omronsoft/openwnn/OpenWnnJAJP.java
@@ -833,8 +833,13 @@ public class OpenWnnJAJP extends OpenWnn {
         case OpenWnnEvent.INPUT_SOFT_KEY:
             ret = processKeyEvent(keyEvent);
             if (!ret) {
-                mInputConnection.sendKeyEvent(keyEvent);
-                mInputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyEvent.getKeyCode()));
+            	int code = keyEvent.getKeyCode();
+            	if (code == KeyEvent.KEYCODE_ENTER) {
+                    sendKeyChar('\n');
+            	} else {
+                    mInputConnection.sendKeyEvent(keyEvent);
+                    mInputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, code));
+            	}
                 ret = true;
             }
             break;
@@ -2254,17 +2259,15 @@ public class OpenWnnJAJP extends OpenWnn {
                 break;
                 
             case EditorInfo.TYPE_TEXT_VARIATION_PASSWORD:
+            case EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
                 mEnableLearning = false;
                 mEnableConverter = false;
                 mEnableSymbolListNonHalf = false;
                 mFilter.filter = CandidateFilter.FILTER_NON_ASCII; 
                 mDisableAutoCommitEnglishMask |= AUTO_COMMIT_ENGLISH_OFF;
-                mEnableAutoHideKeyboard = true;
                 break;
 
             case EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS:
-                mFilter.filter = CandidateFilter.FILTER_NON_ASCII; 
-                mEnableSymbolListNonHalf = false;
                 mEnableAutoInsertSpace = false;
                 mDisableAutoCommitEnglishMask |= AUTO_COMMIT_ENGLISH_OFF;
                 preferenceDictionary = EngineState.PREFERENCE_DICTIONARY_EMAIL_ADDRESS_URI;
diff --git a/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java b/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
index c8291f1..360d49c 100644
--- a/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
+++ b/src/jp/co/omronsoft/openwnn/TextCandidatesViewManager.java
@@ -46,6 +46,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.AbsoluteLayout;
 import android.widget.ImageView;
 import android.graphics.drawable.Drawable;
 
@@ -86,7 +87,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     /** Layout for the candidates list on normal view */
     private LinearLayout mViewCandidateList1st;
     /** Layout for the candidates list on full view */
-    private RelativeLayout mViewCandidateList2nd;
+    private AbsoluteLayout mViewCandidateList2nd;
     /** {@link OpenWnn} instance using this manager */
     private OpenWnn mWnn;
     /** View type (VIEW_TYPE_NORMAL or VIEW_TYPE_FULL or VIEW_TYPE_CLOSE) */
@@ -98,6 +99,11 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     private int mViewWidth;
     /** Height of the view */
     private int mViewHeight;
+    /** Minimum width of a candidate (density support) */
+    private int mCandidateMinimumWidth;
+    /** Maximum width of a candidate (density support) */
+    private int mCandidateMinimumHeight;
+
     /** Whether hide the view if there is no candidates */
     private boolean mAutoHideMode;
     /** The converter to be get candidates from and notice the selected candidate to. */
@@ -152,7 +158,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     /** Id of the top line view (in full view) */
     private int mFullViewPrevLineTopId;
     /** Layout of the previous candidate (in full view) */
-    private RelativeLayout.LayoutParams mFullViewPrevParams;
+    private ViewGroup.LayoutParams mFullViewPrevParams;
     /** Whether all candidates is displayed */
     private boolean mCreateCandidateDone;
     /** Number of lines in normal view */
@@ -260,6 +266,8 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
         mWnn = parent;
         mViewWidth = width;
         mViewHeight = height;
+        mCandidateMinimumWidth = (int)(CANDIDATE_MINIMUM_WIDTH * mMetrics.density);
+        mCandidateMinimumHeight = (int)(CANDIDATE_MINIMUM_HEIGHT * mMetrics.density);
         mPortrait = 
             (parent.getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE);
 
@@ -274,7 +282,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
         mViewCandidateBase = (ViewGroup)mViewBody.findViewById(R.id.candview_base);
 
         createNormalCandidateView();
-        mViewCandidateList2nd = (RelativeLayout)mViewBody.findViewById(R.id.candidates_2nd_view);
+        mViewCandidateList2nd = (AbsoluteLayout)mViewBody.findViewById(R.id.candidates_2nd_view);
 
         mReadMoreButtonWidth = r.getDrawable(R.drawable.cand_up).getMinimumWidth();
 
@@ -568,23 +576,13 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                 mLineCount++;
             }
 
-            RelativeLayout layout = mViewCandidateList2nd;
+            ViewGroup layout = mViewCandidateList2nd;
 
             int width = indentWidth * occupyCount;
             int height = getCandidateMinimumHeight();
-            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(width, height);
 
-            if (mFullViewPrevLineTopId == 0) {
-                params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-            } else {
-                params.addRule(RelativeLayout.BELOW, mFullViewPrevLineTopId);
-            }
-            
-            if (mFullViewOccupyCount == 0) {
-                params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-            } else {
-                params.addRule(RelativeLayout.RIGHT_OF, (mWordCount - 1));
-            }
+
+            ViewGroup.LayoutParams params = buildLayoutParams(mViewCandidateList2nd, width, height);
 
             textView = (TextView) layout.getChildAt(mFullViewWordCount);
             if (textView == null) {
@@ -680,6 +678,30 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     }
 
     /**
+     * Create AbsoluteLayout.LayoutParams
+     * @param layout AbsoluteLayout
+     * @param width
+     * @param height
+     * @return ViewGroup.LayoutParams
+     */
+    private ViewGroup.LayoutParams buildLayoutParams(AbsoluteLayout layout, int width, int height) {
+
+        int indentWidth = mViewWidth / FULL_VIEW_DIV;
+        int x         = indentWidth * mFullViewOccupyCount;
+        int nomalLine = (mPortrait) ? LINE_NUM_PORTRAIT : LINE_NUM_LANDSCAPE;
+        int y         = getCandidateMinimumHeight() * (mLineCount - nomalLine - 1);
+        ViewGroup.LayoutParams params
+              = new AbsoluteLayout.LayoutParams(width, height, x, y);
+
+        return params;
+    }
+
+
+
+            
+
+
+    /**
      * Create a view for a candidate.
      * @return the view
      */
@@ -743,7 +765,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     public void clearCandidates() {
         clearNormalViewCandidate();
 
-        RelativeLayout layout = mViewCandidateList2nd;
+        ViewGroup layout = mViewCandidateList2nd;
         int size = layout.getChildCount();
         for (int i = 0; i < size; i++) {
             View v = layout.getChildAt(i);
@@ -877,6 +899,10 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
      * @return          The width of string to draw
      */ 
     public int measureText(CharSequence text, int start, int end) {
+        if (end - start < 3) {
+            return getCandidateMinimumWidth();
+        }
+
         TextPaint paint = mViewCandidateTemplate.getPaint();
         return (int)paint.measureText(text, start, end);
     }
@@ -956,13 +982,13 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
      * @return the minimum width of a candidate view.
      */
     private int getCandidateMinimumWidth() {
-        return (int)(CANDIDATE_MINIMUM_WIDTH * mMetrics.density);
+        return mCandidateMinimumWidth;
     }
 
     /**
      * @return the minimum height of a candidate view.
      */
     private int getCandidateMinimumHeight() {
-        return (int)(CANDIDATE_MINIMUM_HEIGHT * mMetrics.density);
+        return mCandidateMinimumHeight;
     }
 }
diff --git a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
index a12496a..1348e5d 100644
--- a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
+++ b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsEdit.java
@@ -169,8 +169,9 @@ public abstract class UserDictionaryToolsEdit extends Activity implements View.O
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             /* go back to the word list view */
             screenTransition();
+            return true;
         }
-        return false;
+        return super.onKeyDown(keyCode, event);
     }
 
     /**
diff --git a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
index 0b9a2cd..962a7ae 100644
--- a/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
+++ b/src/jp/co/omronsoft/openwnn/UserDictionaryToolsList.java
@@ -331,7 +331,7 @@ public abstract class UserDictionaryToolsList extends Activity
             openOptionsMenu();
             return true;
         }
-        return false;
+         return super.onKeyUp(keyCode, event);
     }
 
     /** @see android.app.Activity#onCreateDialog */
author	Daisuke Miyakawa <dmiyakawa@google.com>	2009-10-28 15:39:18 +0900
committer	Daisuke Miyakawa <dmiyakawa@google.com>	2009-10-28 15:39:18 +0900
commit	0470b8581ba08779a7cc223c050e7b3556891f45 (patch)
tree	2f04bc96054213ab24178cdc1706f3e1b9309cee
parent	31d95f0171794861eb8ed43588cca9d72c990cc6 (diff)
download	OpenWnn-0470b8581ba08779a7cc223c050e7b3556891f45.tar.gz