From 1be7669a8853539b5821534caf5b93d977e6caa6 Mon Sep 17 00:00:00 2001 From: Hiromitsu Shioya Date: Wed, 23 Sep 2009 17:37:56 +0900 Subject: [PATCH] =?utf8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E5=85=A5=E5=8A=9B?= =?utf8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- AndroidManifest.xml | 2 +- res/values-ja/string.xml | 8 +- res/values/strings.xml | 6 +- res/xml/keyboard_12key_full_bell_a.xml | 2 +- res/xml/keyboard_12key_full_bell_a_land.xml | 2 +- res/xml/keyboard_12key_full_bell_h.xml | 2 +- res/xml/keyboard_12key_full_bell_h_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_a.xml | 2 +- res/xml/keyboard_12key_full_bell_input_a_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_h.xml | 2 +- res/xml/keyboard_12key_full_bell_input_h_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_k.xml | 2 +- res/xml/keyboard_12key_full_bell_input_k_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_m.xml | 2 +- res/xml/keyboard_12key_full_bell_input_m_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_n.xml | 2 +- res/xml/keyboard_12key_full_bell_input_n_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_r.xml | 2 +- res/xml/keyboard_12key_full_bell_input_r_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_s.xml | 2 +- res/xml/keyboard_12key_full_bell_input_s_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_t.xml | 2 +- res/xml/keyboard_12key_full_bell_input_t_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_top.xml | 2 +- .../keyboard_12key_full_bell_input_top_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_w.xml | 2 +- res/xml/keyboard_12key_full_bell_input_w_land.xml | 2 +- res/xml/keyboard_12key_full_bell_input_y.xml | 2 +- res/xml/keyboard_12key_full_bell_input_y_land.xml | 2 +- res/xml/keyboard_12key_full_bell_k.xml | 2 +- res/xml/keyboard_12key_full_bell_k_land.xml | 2 +- res/xml/keyboard_12key_full_bell_m.xml | 2 +- res/xml/keyboard_12key_full_bell_m_land.xml | 2 +- res/xml/keyboard_12key_full_bell_n.xml | 2 +- res/xml/keyboard_12key_full_bell_n_land.xml | 2 +- res/xml/keyboard_12key_full_bell_r.xml | 2 +- res/xml/keyboard_12key_full_bell_r_land.xml | 2 +- res/xml/keyboard_12key_full_bell_s.xml | 2 +- res/xml/keyboard_12key_full_bell_s_land.xml | 2 +- res/xml/keyboard_12key_full_bell_t.xml | 2 +- res/xml/keyboard_12key_full_bell_t_land.xml | 2 +- res/xml/keyboard_12key_full_bell_top.xml | 2 +- res/xml/keyboard_12key_full_bell_top_land.xml | 2 +- res/xml/keyboard_12key_full_bell_w.xml | 2 +- res/xml/keyboard_12key_full_bell_w_land.xml | 2 +- res/xml/keyboard_12key_full_bell_y.xml | 2 +- res/xml/keyboard_12key_full_bell_y_land.xml | 2 +- res/xml/keyboard_12key_full_niko_a.xml | 2 +- res/xml/keyboard_12key_full_niko_a_land.xml | 2 +- res/xml/keyboard_12key_full_niko_h.xml | 2 +- res/xml/keyboard_12key_full_niko_h_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_a.xml | 2 +- res/xml/keyboard_12key_full_niko_input_a_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_h.xml | 2 +- res/xml/keyboard_12key_full_niko_input_h_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_k.xml | 2 +- res/xml/keyboard_12key_full_niko_input_k_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_m.xml | 2 +- res/xml/keyboard_12key_full_niko_input_m_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_n.xml | 2 +- res/xml/keyboard_12key_full_niko_input_n_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_r.xml | 2 +- res/xml/keyboard_12key_full_niko_input_r_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_s.xml | 2 +- res/xml/keyboard_12key_full_niko_input_s_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_t.xml | 2 +- res/xml/keyboard_12key_full_niko_input_t_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_top.xml | 2 +- .../keyboard_12key_full_niko_input_top_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_w.xml | 2 +- res/xml/keyboard_12key_full_niko_input_w_land.xml | 2 +- res/xml/keyboard_12key_full_niko_input_y.xml | 2 +- res/xml/keyboard_12key_full_niko_input_y_land.xml | 2 +- res/xml/keyboard_12key_full_niko_k.xml | 2 +- res/xml/keyboard_12key_full_niko_k_land.xml | 2 +- res/xml/keyboard_12key_full_niko_m.xml | 2 +- res/xml/keyboard_12key_full_niko_m_land.xml | 2 +- res/xml/keyboard_12key_full_niko_n.xml | 2 +- res/xml/keyboard_12key_full_niko_n_land.xml | 2 +- res/xml/keyboard_12key_full_niko_r.xml | 2 +- res/xml/keyboard_12key_full_niko_r_land.xml | 2 +- res/xml/keyboard_12key_full_niko_s.xml | 2 +- res/xml/keyboard_12key_full_niko_s_land.xml | 2 +- res/xml/keyboard_12key_full_niko_t.xml | 2 +- res/xml/keyboard_12key_full_niko_t_land.xml | 2 +- res/xml/keyboard_12key_full_niko_top.xml | 2 +- res/xml/keyboard_12key_full_niko_top_land.xml | 2 +- res/xml/keyboard_12key_full_niko_w.xml | 2 +- res/xml/keyboard_12key_full_niko_w_land.xml | 2 +- res/xml/keyboard_12key_full_niko_y.xml | 2 +- res/xml/keyboard_12key_full_niko_y_land.xml | 2 +- res/xml/keyboard_12key_full_ybell_input_y.xml | 2 +- res/xml/keyboard_12key_full_ybell_input_y_land.xml | 2 +- res/xml/keyboard_12key_full_ybell_y.xml | 2 +- res/xml/keyboard_12key_full_ybell_y_land.xml | 2 +- res/xml/symbols_docomo_emoji_list.xml | 256 +++++++++++++++++ .../nicownn2/JAJP/DefaultSoftKeyboardJAJP.java | 155 +++++----- .../android/input/nicownn2/NicoWnnJAJP.java | 22 +- .../android/input/nicownn2/SymbolList.java | 4 + .../input/nicownn2/TextCandidatesViewManager.java | 319 +++++++++++++-------- 100 files changed, 660 insertions(+), 296 deletions(-) create mode 100644 res/xml/symbols_docomo_emoji_list.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 176eabd..a293c0a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,7 +16,7 @@ + android:versionCode="13" android:versionName="1.0.13"> diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml index d03a1c0..b505a1d 100644 --- a/res/values-ja/string.xml +++ b/res/values-ja/string.xml @@ -79,7 +79,7 @@ 英数字モード チェックを入れると英数字がQWERTYになります - ニコタッチモード + キー配置 チェックを入れるとベル打ちになります や行の扱い @@ -120,13 +120,13 @@ - OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica + OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.13\nオムロン ソフトウェア(株)/hiroshica - OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica + OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.13\nオムロン ソフトウェア(株)/hiroshica - OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.12\nオムロン ソフトウェア(株)/hiroshica + OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.13\nオムロン ソフトウェア(株)/hiroshica 選　択 diff --git a/res/values/strings.xml b/res/values/strings.xml index edfe85f..bce7eba 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -125,20 +125,20 @@ - Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12 + Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.13 nicoWnn English /data/data/com.hiroshica.android.input.nicownn2/lib/libWnnEngDic.so /data/data/com.hiroshica.android.input.nicownn2/writableEN.dic .,;:!? - Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12 + Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.13 nicoWnn IME /data/data/com.hiroshica.android.input.nicownn2/lib/libWnnJpnDic.so /data/data/com.hiroshica.android.input.nicownn2/writableJAJP.dic - Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.12 + Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.13 nicoWnn Chinese /data/data/com.hiroshica.android.input.nicownn2/lib/libWnnZHCNDic.so diff --git a/res/xml/keyboard_12key_full_bell_a.xml b/res/xml/keyboard_12key_full_bell_a.xml index 798b409..b20db71 100644 --- a/res/xml/keyboard_12key_full_bell_a.xml +++ b/res/xml/keyboard_12key_full_bell_a.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_a_land.xml b/res/xml/keyboard_12key_full_bell_a_land.xml index 5d39672..2e89d05 100644 --- a/res/xml/keyboard_12key_full_bell_a_land.xml +++ b/res/xml/keyboard_12key_full_bell_a_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_h.xml b/res/xml/keyboard_12key_full_bell_h.xml index 394e0b4..f01a3c5 100644 --- a/res/xml/keyboard_12key_full_bell_h.xml +++ b/res/xml/keyboard_12key_full_bell_h.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_h_land.xml b/res/xml/keyboard_12key_full_bell_h_land.xml index 7cb406f..56722ef 100644 --- a/res/xml/keyboard_12key_full_bell_h_land.xml +++ b/res/xml/keyboard_12key_full_bell_h_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_a.xml b/res/xml/keyboard_12key_full_bell_input_a.xml index 03bd5ac..08cd98c 100644 --- a/res/xml/keyboard_12key_full_bell_input_a.xml +++ b/res/xml/keyboard_12key_full_bell_input_a.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_a_land.xml b/res/xml/keyboard_12key_full_bell_input_a_land.xml index cfa4def..a145ecd 100644 --- a/res/xml/keyboard_12key_full_bell_input_a_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_a_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_h.xml b/res/xml/keyboard_12key_full_bell_input_h.xml index 339157e..ac1a3fa 100644 --- a/res/xml/keyboard_12key_full_bell_input_h.xml +++ b/res/xml/keyboard_12key_full_bell_input_h.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_h_land.xml b/res/xml/keyboard_12key_full_bell_input_h_land.xml index ad4c423..0a95d33 100644 --- a/res/xml/keyboard_12key_full_bell_input_h_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_h_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_k.xml b/res/xml/keyboard_12key_full_bell_input_k.xml index 65ccebc..3e82f20 100644 --- a/res/xml/keyboard_12key_full_bell_input_k.xml +++ b/res/xml/keyboard_12key_full_bell_input_k.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_k_land.xml b/res/xml/keyboard_12key_full_bell_input_k_land.xml index 726563f..bbc062a 100644 --- a/res/xml/keyboard_12key_full_bell_input_k_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_k_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_m.xml b/res/xml/keyboard_12key_full_bell_input_m.xml index 156b264..ed6c29b 100644 --- a/res/xml/keyboard_12key_full_bell_input_m.xml +++ b/res/xml/keyboard_12key_full_bell_input_m.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_m_land.xml b/res/xml/keyboard_12key_full_bell_input_m_land.xml index 8db22e0..0ae88a3 100644 --- a/res/xml/keyboard_12key_full_bell_input_m_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_m_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_n.xml b/res/xml/keyboard_12key_full_bell_input_n.xml index 699f747..f5494fb 100644 --- a/res/xml/keyboard_12key_full_bell_input_n.xml +++ b/res/xml/keyboard_12key_full_bell_input_n.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_n_land.xml b/res/xml/keyboard_12key_full_bell_input_n_land.xml index 14386c9..3531498 100644 --- a/res/xml/keyboard_12key_full_bell_input_n_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_n_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_r.xml b/res/xml/keyboard_12key_full_bell_input_r.xml index b9353d2..c7ef3f2 100644 --- a/res/xml/keyboard_12key_full_bell_input_r.xml +++ b/res/xml/keyboard_12key_full_bell_input_r.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_r_land.xml b/res/xml/keyboard_12key_full_bell_input_r_land.xml index da7aee3..e9a6846 100644 --- a/res/xml/keyboard_12key_full_bell_input_r_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_r_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_s.xml b/res/xml/keyboard_12key_full_bell_input_s.xml index 991f6c0..0ae186f 100644 --- a/res/xml/keyboard_12key_full_bell_input_s.xml +++ b/res/xml/keyboard_12key_full_bell_input_s.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_s_land.xml b/res/xml/keyboard_12key_full_bell_input_s_land.xml index 70fc181..2cbfc85 100644 --- a/res/xml/keyboard_12key_full_bell_input_s_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_s_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_t.xml b/res/xml/keyboard_12key_full_bell_input_t.xml index 0274cfd..5905f86 100644 --- a/res/xml/keyboard_12key_full_bell_input_t.xml +++ b/res/xml/keyboard_12key_full_bell_input_t.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_t_land.xml b/res/xml/keyboard_12key_full_bell_input_t_land.xml index 8778a03..1373dff 100644 --- a/res/xml/keyboard_12key_full_bell_input_t_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_t_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_top.xml b/res/xml/keyboard_12key_full_bell_input_top.xml index 7f51c26..b9801fc 100644 --- a/res/xml/keyboard_12key_full_bell_input_top.xml +++ b/res/xml/keyboard_12key_full_bell_input_top.xml @@ -51,7 +51,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_top_land.xml b/res/xml/keyboard_12key_full_bell_input_top_land.xml index d974d87..cdae395 100644 --- a/res/xml/keyboard_12key_full_bell_input_top_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_top_land.xml @@ -51,7 +51,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_w.xml b/res/xml/keyboard_12key_full_bell_input_w.xml index bc8f8a8..d581941 100644 --- a/res/xml/keyboard_12key_full_bell_input_w.xml +++ b/res/xml/keyboard_12key_full_bell_input_w.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_w_land.xml b/res/xml/keyboard_12key_full_bell_input_w_land.xml index b3f3db7..d406d00 100644 --- a/res/xml/keyboard_12key_full_bell_input_w_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_w_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_y.xml b/res/xml/keyboard_12key_full_bell_input_y.xml index 0daacf8..208e929 100644 --- a/res/xml/keyboard_12key_full_bell_input_y.xml +++ b/res/xml/keyboard_12key_full_bell_input_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_input_y_land.xml b/res/xml/keyboard_12key_full_bell_input_y_land.xml index e8b81e9..2d5e021 100644 --- a/res/xml/keyboard_12key_full_bell_input_y_land.xml +++ b/res/xml/keyboard_12key_full_bell_input_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_k.xml b/res/xml/keyboard_12key_full_bell_k.xml index 0547bb0..d6a8dc9 100644 --- a/res/xml/keyboard_12key_full_bell_k.xml +++ b/res/xml/keyboard_12key_full_bell_k.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_k_land.xml b/res/xml/keyboard_12key_full_bell_k_land.xml index 1ccb76b..0ecc416 100644 --- a/res/xml/keyboard_12key_full_bell_k_land.xml +++ b/res/xml/keyboard_12key_full_bell_k_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_m.xml b/res/xml/keyboard_12key_full_bell_m.xml index 17d0fa2..c438e80 100644 --- a/res/xml/keyboard_12key_full_bell_m.xml +++ b/res/xml/keyboard_12key_full_bell_m.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_m_land.xml b/res/xml/keyboard_12key_full_bell_m_land.xml index 127d69e..873617e 100644 --- a/res/xml/keyboard_12key_full_bell_m_land.xml +++ b/res/xml/keyboard_12key_full_bell_m_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_n.xml b/res/xml/keyboard_12key_full_bell_n.xml index 2b609ae..269fbaa 100644 --- a/res/xml/keyboard_12key_full_bell_n.xml +++ b/res/xml/keyboard_12key_full_bell_n.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_n_land.xml b/res/xml/keyboard_12key_full_bell_n_land.xml index b3b80a2..ded1c23 100644 --- a/res/xml/keyboard_12key_full_bell_n_land.xml +++ b/res/xml/keyboard_12key_full_bell_n_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_r.xml b/res/xml/keyboard_12key_full_bell_r.xml index ac9f42d..63a1837 100644 --- a/res/xml/keyboard_12key_full_bell_r.xml +++ b/res/xml/keyboard_12key_full_bell_r.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_r_land.xml b/res/xml/keyboard_12key_full_bell_r_land.xml index 3b4e431..eb62cdd 100644 --- a/res/xml/keyboard_12key_full_bell_r_land.xml +++ b/res/xml/keyboard_12key_full_bell_r_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_s.xml b/res/xml/keyboard_12key_full_bell_s.xml index a5ba14c..34f5650 100644 --- a/res/xml/keyboard_12key_full_bell_s.xml +++ b/res/xml/keyboard_12key_full_bell_s.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_s_land.xml b/res/xml/keyboard_12key_full_bell_s_land.xml index 18165dd..26b5665 100644 --- a/res/xml/keyboard_12key_full_bell_s_land.xml +++ b/res/xml/keyboard_12key_full_bell_s_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_t.xml b/res/xml/keyboard_12key_full_bell_t.xml index a13bac8..aa1962d 100644 --- a/res/xml/keyboard_12key_full_bell_t.xml +++ b/res/xml/keyboard_12key_full_bell_t.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_t_land.xml b/res/xml/keyboard_12key_full_bell_t_land.xml index 2f2ccd6..bbc314a 100644 --- a/res/xml/keyboard_12key_full_bell_t_land.xml +++ b/res/xml/keyboard_12key_full_bell_t_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_top.xml b/res/xml/keyboard_12key_full_bell_top.xml index cf84262..99ec619 100644 --- a/res/xml/keyboard_12key_full_bell_top.xml +++ b/res/xml/keyboard_12key_full_bell_top.xml @@ -52,7 +52,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_top_land.xml b/res/xml/keyboard_12key_full_bell_top_land.xml index 42d5d76..cfc93b6 100644 --- a/res/xml/keyboard_12key_full_bell_top_land.xml +++ b/res/xml/keyboard_12key_full_bell_top_land.xml @@ -52,7 +52,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_w.xml b/res/xml/keyboard_12key_full_bell_w.xml index 9d423c7..bb69b0d 100644 --- a/res/xml/keyboard_12key_full_bell_w.xml +++ b/res/xml/keyboard_12key_full_bell_w.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_w_land.xml b/res/xml/keyboard_12key_full_bell_w_land.xml index e0862ec..0097d16 100644 --- a/res/xml/keyboard_12key_full_bell_w_land.xml +++ b/res/xml/keyboard_12key_full_bell_w_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_y.xml b/res/xml/keyboard_12key_full_bell_y.xml index df32c15..cc20dc7 100644 --- a/res/xml/keyboard_12key_full_bell_y.xml +++ b/res/xml/keyboard_12key_full_bell_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_bell_y_land.xml b/res/xml/keyboard_12key_full_bell_y_land.xml index 00ee635..6f6a00f 100644 --- a/res/xml/keyboard_12key_full_bell_y_land.xml +++ b/res/xml/keyboard_12key_full_bell_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_a.xml b/res/xml/keyboard_12key_full_niko_a.xml index 2db6d4e..4d3630d 100644 --- a/res/xml/keyboard_12key_full_niko_a.xml +++ b/res/xml/keyboard_12key_full_niko_a.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_a_land.xml b/res/xml/keyboard_12key_full_niko_a_land.xml index e074b4f..6d950ec 100644 --- a/res/xml/keyboard_12key_full_niko_a_land.xml +++ b/res/xml/keyboard_12key_full_niko_a_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_h.xml b/res/xml/keyboard_12key_full_niko_h.xml index 90feab1..35b243f 100644 --- a/res/xml/keyboard_12key_full_niko_h.xml +++ b/res/xml/keyboard_12key_full_niko_h.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_h_land.xml b/res/xml/keyboard_12key_full_niko_h_land.xml index 41d0c5a..008c826 100644 --- a/res/xml/keyboard_12key_full_niko_h_land.xml +++ b/res/xml/keyboard_12key_full_niko_h_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_a.xml b/res/xml/keyboard_12key_full_niko_input_a.xml index c6c00ca..b8fe1a3 100644 --- a/res/xml/keyboard_12key_full_niko_input_a.xml +++ b/res/xml/keyboard_12key_full_niko_input_a.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_a_land.xml b/res/xml/keyboard_12key_full_niko_input_a_land.xml index 0f1ce11..32729cf 100644 --- a/res/xml/keyboard_12key_full_niko_input_a_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_a_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_h.xml b/res/xml/keyboard_12key_full_niko_input_h.xml index 29c12f7..f4fae43 100644 --- a/res/xml/keyboard_12key_full_niko_input_h.xml +++ b/res/xml/keyboard_12key_full_niko_input_h.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_h_land.xml b/res/xml/keyboard_12key_full_niko_input_h_land.xml index 3d55f98..6d875ef 100644 --- a/res/xml/keyboard_12key_full_niko_input_h_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_h_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_k.xml b/res/xml/keyboard_12key_full_niko_input_k.xml index 03888ca..a19077c 100644 --- a/res/xml/keyboard_12key_full_niko_input_k.xml +++ b/res/xml/keyboard_12key_full_niko_input_k.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_k_land.xml b/res/xml/keyboard_12key_full_niko_input_k_land.xml index c5fdde6..b1f5969 100644 --- a/res/xml/keyboard_12key_full_niko_input_k_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_k_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_m.xml b/res/xml/keyboard_12key_full_niko_input_m.xml index 7e7045b..5d2e45e 100644 --- a/res/xml/keyboard_12key_full_niko_input_m.xml +++ b/res/xml/keyboard_12key_full_niko_input_m.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_m_land.xml b/res/xml/keyboard_12key_full_niko_input_m_land.xml index d76aa17..dbd68d2 100644 --- a/res/xml/keyboard_12key_full_niko_input_m_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_m_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_n.xml b/res/xml/keyboard_12key_full_niko_input_n.xml index 899dda6..253bd81 100644 --- a/res/xml/keyboard_12key_full_niko_input_n.xml +++ b/res/xml/keyboard_12key_full_niko_input_n.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_n_land.xml b/res/xml/keyboard_12key_full_niko_input_n_land.xml index b21be33..27915be 100644 --- a/res/xml/keyboard_12key_full_niko_input_n_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_n_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_r.xml b/res/xml/keyboard_12key_full_niko_input_r.xml index 46e1f71..926f89a 100644 --- a/res/xml/keyboard_12key_full_niko_input_r.xml +++ b/res/xml/keyboard_12key_full_niko_input_r.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_r_land.xml b/res/xml/keyboard_12key_full_niko_input_r_land.xml index f1b94fa..76a75eb 100644 --- a/res/xml/keyboard_12key_full_niko_input_r_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_r_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_s.xml b/res/xml/keyboard_12key_full_niko_input_s.xml index e869c12..0fa63a4 100644 --- a/res/xml/keyboard_12key_full_niko_input_s.xml +++ b/res/xml/keyboard_12key_full_niko_input_s.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_s_land.xml b/res/xml/keyboard_12key_full_niko_input_s_land.xml index 4085700..b0cfee5 100644 --- a/res/xml/keyboard_12key_full_niko_input_s_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_s_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_t.xml b/res/xml/keyboard_12key_full_niko_input_t.xml index 6cc8c90..3d38eb9 100644 --- a/res/xml/keyboard_12key_full_niko_input_t.xml +++ b/res/xml/keyboard_12key_full_niko_input_t.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_t_land.xml b/res/xml/keyboard_12key_full_niko_input_t_land.xml index 289c494..efe1250 100644 --- a/res/xml/keyboard_12key_full_niko_input_t_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_t_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_top.xml b/res/xml/keyboard_12key_full_niko_input_top.xml index e2b0823..f7816ea 100644 --- a/res/xml/keyboard_12key_full_niko_input_top.xml +++ b/res/xml/keyboard_12key_full_niko_input_top.xml @@ -51,7 +51,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_top_land.xml b/res/xml/keyboard_12key_full_niko_input_top_land.xml index ee0d4de..5ec6051 100644 --- a/res/xml/keyboard_12key_full_niko_input_top_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_top_land.xml @@ -52,7 +52,7 @@ - diff --git a/res/xml/keyboard_12key_full_niko_input_w.xml b/res/xml/keyboard_12key_full_niko_input_w.xml index c138021..2d3f5b3 100644 --- a/res/xml/keyboard_12key_full_niko_input_w.xml +++ b/res/xml/keyboard_12key_full_niko_input_w.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_w_land.xml b/res/xml/keyboard_12key_full_niko_input_w_land.xml index d6de532..e86f9d6 100644 --- a/res/xml/keyboard_12key_full_niko_input_w_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_w_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_y.xml b/res/xml/keyboard_12key_full_niko_input_y.xml index ac962a3..021d97a 100644 --- a/res/xml/keyboard_12key_full_niko_input_y.xml +++ b/res/xml/keyboard_12key_full_niko_input_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_input_y_land.xml b/res/xml/keyboard_12key_full_niko_input_y_land.xml index 337d687..52df2db 100644 --- a/res/xml/keyboard_12key_full_niko_input_y_land.xml +++ b/res/xml/keyboard_12key_full_niko_input_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_k.xml b/res/xml/keyboard_12key_full_niko_k.xml index 27ca01d..c01e077 100644 --- a/res/xml/keyboard_12key_full_niko_k.xml +++ b/res/xml/keyboard_12key_full_niko_k.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_k_land.xml b/res/xml/keyboard_12key_full_niko_k_land.xml index b548513..bd3c5d1 100644 --- a/res/xml/keyboard_12key_full_niko_k_land.xml +++ b/res/xml/keyboard_12key_full_niko_k_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_m.xml b/res/xml/keyboard_12key_full_niko_m.xml index 21da4ad..d3d46a3 100644 --- a/res/xml/keyboard_12key_full_niko_m.xml +++ b/res/xml/keyboard_12key_full_niko_m.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_m_land.xml b/res/xml/keyboard_12key_full_niko_m_land.xml index 828b92a..8ccbc2b 100644 --- a/res/xml/keyboard_12key_full_niko_m_land.xml +++ b/res/xml/keyboard_12key_full_niko_m_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_n.xml b/res/xml/keyboard_12key_full_niko_n.xml index 677dc38..d8c087c 100644 --- a/res/xml/keyboard_12key_full_niko_n.xml +++ b/res/xml/keyboard_12key_full_niko_n.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_n_land.xml b/res/xml/keyboard_12key_full_niko_n_land.xml index d58f17e..babb028 100644 --- a/res/xml/keyboard_12key_full_niko_n_land.xml +++ b/res/xml/keyboard_12key_full_niko_n_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_r.xml b/res/xml/keyboard_12key_full_niko_r.xml index df706e1..dfd07bf 100644 --- a/res/xml/keyboard_12key_full_niko_r.xml +++ b/res/xml/keyboard_12key_full_niko_r.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_r_land.xml b/res/xml/keyboard_12key_full_niko_r_land.xml index 4b07d78..6d6d616 100644 --- a/res/xml/keyboard_12key_full_niko_r_land.xml +++ b/res/xml/keyboard_12key_full_niko_r_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_s.xml b/res/xml/keyboard_12key_full_niko_s.xml index 674692f..27da7b9 100644 --- a/res/xml/keyboard_12key_full_niko_s.xml +++ b/res/xml/keyboard_12key_full_niko_s.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_s_land.xml b/res/xml/keyboard_12key_full_niko_s_land.xml index 603466d..7017589 100644 --- a/res/xml/keyboard_12key_full_niko_s_land.xml +++ b/res/xml/keyboard_12key_full_niko_s_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_t.xml b/res/xml/keyboard_12key_full_niko_t.xml index ce9e019..b2e22f9 100644 --- a/res/xml/keyboard_12key_full_niko_t.xml +++ b/res/xml/keyboard_12key_full_niko_t.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_t_land.xml b/res/xml/keyboard_12key_full_niko_t_land.xml index 5747959..73b631e 100644 --- a/res/xml/keyboard_12key_full_niko_t_land.xml +++ b/res/xml/keyboard_12key_full_niko_t_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_top.xml b/res/xml/keyboard_12key_full_niko_top.xml index 8dd36fb..384de9e 100644 --- a/res/xml/keyboard_12key_full_niko_top.xml +++ b/res/xml/keyboard_12key_full_niko_top.xml @@ -52,7 +52,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_top_land.xml b/res/xml/keyboard_12key_full_niko_top_land.xml index 52405ad..a296e19 100644 --- a/res/xml/keyboard_12key_full_niko_top_land.xml +++ b/res/xml/keyboard_12key_full_niko_top_land.xml @@ -52,7 +52,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_w.xml b/res/xml/keyboard_12key_full_niko_w.xml index e935ac1..3ac0554 100644 --- a/res/xml/keyboard_12key_full_niko_w.xml +++ b/res/xml/keyboard_12key_full_niko_w.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_w_land.xml b/res/xml/keyboard_12key_full_niko_w_land.xml index d051892..9a63790 100644 --- a/res/xml/keyboard_12key_full_niko_w_land.xml +++ b/res/xml/keyboard_12key_full_niko_w_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_y.xml b/res/xml/keyboard_12key_full_niko_y.xml index 1f276dd..3a097a3 100644 --- a/res/xml/keyboard_12key_full_niko_y.xml +++ b/res/xml/keyboard_12key_full_niko_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_niko_y_land.xml b/res/xml/keyboard_12key_full_niko_y_land.xml index a9f7f6b..c771b0b 100644 --- a/res/xml/keyboard_12key_full_niko_y_land.xml +++ b/res/xml/keyboard_12key_full_niko_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_ybell_input_y.xml b/res/xml/keyboard_12key_full_ybell_input_y.xml index dcfaabc..a8e3c03 100644 --- a/res/xml/keyboard_12key_full_ybell_input_y.xml +++ b/res/xml/keyboard_12key_full_ybell_input_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_ybell_input_y_land.xml b/res/xml/keyboard_12key_full_ybell_input_y_land.xml index e718da8..7b40a40 100644 --- a/res/xml/keyboard_12key_full_ybell_input_y_land.xml +++ b/res/xml/keyboard_12key_full_ybell_input_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_ybell_y.xml b/res/xml/keyboard_12key_full_ybell_y.xml index 62f7141..f85dcda 100644 --- a/res/xml/keyboard_12key_full_ybell_y.xml +++ b/res/xml/keyboard_12key_full_ybell_y.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/keyboard_12key_full_ybell_y_land.xml b/res/xml/keyboard_12key_full_ybell_y_land.xml index 9d358a0..8a5eb04 100644 --- a/res/xml/keyboard_12key_full_ybell_y_land.xml +++ b/res/xml/keyboard_12key_full_ybell_y_land.xml @@ -49,7 +49,7 @@ - + diff --git a/res/xml/symbols_docomo_emoji_list.xml b/res/xml/symbols_docomo_emoji_list.xml new file mode 100644 index 0000000..70cc637 --- /dev/null +++ b/res/xml/symbols_docomo_emoji_list.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java index eaff857..5266181 100644 --- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java +++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java @@ -427,11 +427,11 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { private int mHookStockKeyType; /** change keitai skip **/ - private boolean mOnOffKeitaiMode = false; + private boolean mOnOffKeitaiMode = false; /** change eisu change mode **/ - private boolean mChange12keyQwertyMode = false; - private final int[] m12keyTable = { - KEYBOARD_12KEY, KEYBOARD_12KEY, KEYBOARD_QWERTY, KEYBOARD_QWERTY, KEYBOARD_12KEY, KEYBOARD_QWERTY, KEYBOARD_QWERTY, KEYBOARD_12KEY, KEYBOARD_12KEY + private boolean mChange12keyQwertyMode = false; + private final int[] m12keyTable = { + KEYBOARD_12KEY, KEYBOARD_12KEY, KEYBOARD_QWERTY, KEYBOARD_QWERTY, KEYBOARD_12KEY, KEYBOARD_QWERTY, KEYBOARD_QWERTY, KEYBOARD_12KEY, KEYBOARD_12KEY }; /** option bell type **/ private boolean mChangeYLineBellMode = false; @@ -473,10 +473,10 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { if (mCurrentKeyboardType == KEYBOARD_12KEY) { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE, - NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_12KEY)); + NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_12KEY)); } else { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE, - NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY)); + NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY)); } } @@ -505,8 +505,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { if (mCapsLock) { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_SOFT_KEY, - new KeyEvent(KeyEvent.ACTION_UP, - KeyEvent.KEYCODE_SHIFT_LEFT))); + new KeyEvent(KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SHIFT_LEFT))); mCapsLock = false; } mShiftOn = KEYBOARD_SHIFT_OFF; @@ -574,7 +574,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { changeKeyboard(kbd); mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE, mode)); if (mChange12keyQwertyMode == true) { - changeKeyboardType(m12keyTable[targetMode]); + changeKeyboardType(m12keyTable[targetMode]); } } @@ -628,7 +628,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { mPrefEditor = pref.edit(); boolean isQwerty = pref.getBoolean("opt_enable_qwerty", false); if (isQwerty && (mCurrentKeyboardType != KEYBOARD_QWERTY)) { - changeKeyboardType(KEYBOARD_QWERTY); + changeKeyboardType(KEYBOARD_QWERTY); } super.setPreferences(pref, editor); @@ -659,8 +659,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { mOnOffKeitaiMode = pref.getBoolean("change_keitaimode", false); if (true == mOnOffKeitaiMode) { - // off keitai hiragana mode - mLimitedKeyMode = new int[] {KEYMODE_JA_FULL_NIKO, KEYMODE_JA_HALF_ALPHABET, KEYMODE_JA_HALF_NUMBER}; + // off keitai hiragana mode + mLimitedKeyMode = new int[] {KEYMODE_JA_FULL_NIKO, KEYMODE_JA_HALF_ALPHABET, KEYMODE_JA_HALF_NUMBER}; } switch (inputType & EditorInfo.TYPE_MASK_CLASS) { @@ -671,11 +671,11 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { case EditorInfo.TYPE_CLASS_PHONE: if (mHardKeyboardHidden) { - //mLimitedKeyMode = new int[] {KEYMODE_JA_FULL_NIKO}; - mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO; + //mLimitedKeyMode = new int[] {KEYMODE_JA_FULL_NIKO}; + mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO; } else { - //mLimitedKeyMode = new int[] {KEYMODE_JA_HALF_ALPHABET}; - mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO; + //mLimitedKeyMode = new int[] {KEYMODE_JA_HALF_ALPHABET}; + mPreferenceKeyMode = KEYMODE_JA_FULL_NIKO; } break; @@ -711,23 +711,23 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { mChangeYLineBellMode = pref.getBoolean("change_y_bellmode", false); mChangeBellMode = pref.getBoolean("change_bellmode", false); if (old12keyqwerty != mChange12keyQwertyMode) { - restartkey = true; - if (false == mChange12keyQwertyMode) { - mCurrentKeyboardType = mHookStockKeyType; // change last keyboard type. - } + restartkey = true; + if (false == mChange12keyQwertyMode) { + mCurrentKeyboardType = mHookStockKeyType; // change last keyboard type. + } } if (oldnicobell != mChangeBellMode) { - restartkey = true; + restartkey = true; } if (inputType != mLastInputType) { - changeNicoBellLayout(); - setDefaultKeyboard(); - mLastInputType = inputType; + changeNicoBellLayout(); + setDefaultKeyboard(); + mLastInputType = inputType; } else if (true == restartkey) { - changeNicoBellLayout(); - setDefaultKeyboard(); + changeNicoBellLayout(); + setDefaultKeyboard(); } setStatusIcon(); @@ -808,7 +808,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { * @param parent The context */ private void createKeyboardsPortrait(NicoWnn parent) { - Keyboard[][] keyList; + Keyboard[][] keyList; /* qwerty shift_off (portrait) */ keyList = mKeyboard[LANG_JA][PORTRAIT][KEYBOARD_QWERTY][KEYBOARD_SHIFT_OFF]; keyList[KEYMODE_JA_FULL_HIRAGANA][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp); @@ -949,7 +949,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { * @param parent The context */ private void createKeyboardsLandscape(NicoWnn parent) { - Keyboard[][] keyList; + Keyboard[][] keyList; /* qwerty shift_off (landscape) */ keyList = mKeyboard[LANG_JA][LANDSCAPE][KEYBOARD_QWERTY][KEYBOARD_SHIFT_OFF]; keyList[KEYMODE_JA_FULL_HIRAGANA][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_land); @@ -961,10 +961,10 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { keyList[KEYMODE_JA_HALF_KATAKANA][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_half_katakana_land); keyList[KEYMODE_JA_HALF_PHONE][0] = new Keyboard(parent, R.xml.keyboard_12key_phone_land); if (false == mChangeBellMode) { - keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_niko_land); + keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_niko_land); } else{ - keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_bell_land); + keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_bell_land); } /* qwerty shift_on (landscape) */ keyList = mKeyboard[LANG_JA][LANDSCAPE][KEYBOARD_QWERTY][KEYBOARD_SHIFT_ON]; @@ -977,10 +977,10 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { keyList[KEYMODE_JA_HALF_KATAKANA][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_half_katakana_shift_land); keyList[KEYMODE_JA_HALF_PHONE][0] = mKeyboard[LANG_JA][LANDSCAPE][KEYBOARD_QWERTY][KEYBOARD_SHIFT_OFF][KEYMODE_JA_HALF_PHONE][0]; if (false == mChangeBellMode) { - keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_niko_shift_land); + keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_niko_shift_land); } else{ - keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_bell_shift_land); + keyList[KEYMODE_JA_FULL_NIKO][0] = new Keyboard(parent, R.xml.keyboard_qwerty_jp_bell_shift_land); } /* 12-keys shift_off (landscape) */ keyList = mKeyboard[LANG_JA][LANDSCAPE][KEYBOARD_12KEY][KEYBOARD_SHIFT_OFF]; @@ -1149,12 +1149,12 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { break; case KEYMODE_JA_FULL_NIKO: - if (false == mChangeBellMode) { - cycleTable = JP_FULL_NIKO_CYCLE_TABLE; - } - else{ - cycleTable = JP_FULL_BELL_CYCLE_TABLE; - } + if (false == mChangeBellMode) { + cycleTable = JP_FULL_NIKO_CYCLE_TABLE; + } + else{ + cycleTable = JP_FULL_BELL_CYCLE_TABLE; + } break; default: @@ -1278,13 +1278,13 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { if (mWnn != null) { if (!hidden) { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE, - NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY)); + NicoWnnJAJP.ENGINE_MODE_OPT_TYPE_QWERTY)); } if (mHardKeyboardHidden != hidden) { if ((mLimitedKeyMode != null) || ((mCurrentKeyMode != KEYMODE_JA_FULL_NIKO) && (mCurrentKeyMode != KEYMODE_JA_FULL_HIRAGANA) && (mCurrentKeyMode != KEYMODE_JA_HALF_ALPHABET))) { - + mLastInputType = EditorInfo.TYPE_NULL; if (mWnn.isInputViewShown()) { setDefaultKeyboard(); @@ -1315,7 +1315,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { case KEYMODE_JA_FULL_HIRAGANA: case KEYMODE_JA_FULL_KATAKANA: case KEYMODE_JA_HALF_KATAKANA: - keymode = KEYMODE_JA_FULL_NIKO; + // hiromitsu-s!!! 2009-09-23 12:47:08 + //keymode = KEYMODE_JA_FULL_NIKO; break; default: /* half-alphabet */ @@ -1392,7 +1393,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { case DefaultSoftKeyboard.KEYCODE_QWERTY_BACKSPACE: case KEYCODE_JP12_BACKSPACE: mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_SOFT_KEY, - new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))); + new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))); break; case DefaultSoftKeyboard.KEYCODE_QWERTY_SHIFT: @@ -1406,7 +1407,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { case KEYCODE_QWERTY_ENTER: case KEYCODE_JP12_ENTER: mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_SOFT_KEY, - new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER))); + new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER))); break; case KEYCODE_JP12_REVERSE: @@ -1447,7 +1448,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { /* Send a input character directly if instant input type is selected */ commitText(); mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_CHAR, - mCurrentInstantTable[getTableIndex(primaryCode)])); + mCurrentInstantTable[getTableIndex(primaryCode)])); } else { if ((mPrevInputKeyCode != primaryCode)) { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.TOUCH_OTHER_KEY)); @@ -1475,7 +1476,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { if (mInputType == INPUT_TYPE_INSTANT) { commitText(); mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_CHAR, - mCurrentInstantTable[getTableIndex(primaryCode)])); + mCurrentInstantTable[getTableIndex(primaryCode)])); } else { if (!mNoInput) { /* Processing to toggle Dakuten, Handakuten, and capital */ @@ -1553,19 +1554,19 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { case KEYCODE_JP12_CLOSE: mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_KEY, - new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))); + new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))); break; case KEYCODE_JP12_LEFT: mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_SOFT_KEY, - new KeyEvent(KeyEvent.ACTION_DOWN, - KeyEvent.KEYCODE_DPAD_LEFT))); + new KeyEvent(KeyEvent.ACTION_DOWN, + KeyEvent.KEYCODE_DPAD_LEFT))); break; case KEYCODE_JP12_RIGHT: mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.INPUT_SOFT_KEY, - new KeyEvent(KeyEvent.ACTION_DOWN, - KeyEvent.KEYCODE_DPAD_RIGHT))); + new KeyEvent(KeyEvent.ACTION_DOWN, + KeyEvent.KEYCODE_DPAD_RIGHT))); break; case KEYCODE_NOP: break; @@ -1635,6 +1636,10 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { break; case KEYCODE_JP12_SHARP: + if (mNikoFirst == false) { + commitText(); + mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CHANGE_MODE, NicoWnnJAJP.ENGINE_MODE_DOCOMOSYMBOL)); + } retcode = true; break; @@ -1654,15 +1659,15 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { int index = getTableIndex(primaryCode); Keyboard[][] keyList = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON]; if (false == mChangeBellMode) { - if (false == mChangeYLineBellMode) { - keyList[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[index+1]; - } - else{ - keyList[KEYMODE_JA_FULL_NIKO] = mYBellKeyboard[index+1]; - } + if (false == mChangeYLineBellMode) { + keyList[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[index+1]; + } + else{ + keyList[KEYMODE_JA_FULL_NIKO] = mYBellKeyboard[index+1]; + } } else{ - keyList[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[index+1]; + keyList[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[index+1]; } newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_ON); if (newKeyboard != null) { @@ -1767,25 +1772,25 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard { mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.TOUCH_OTHER_KEY)); } // setLastNikoChar - private void changeNicoBellLayout() { - Keyboard[][] keyList, keyListOn; - keyList = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_OFF]; - keyListOn = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON]; - if (false == mChangeBellMode) { - keyList[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[NIKO_SLIDE_MODE_TOP]; - if (false == mChangeYLineBellMode) { - keyListOn[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[NIKO_SLIDE_MODE_A]; - } - else{ - keyListOn[KEYMODE_JA_FULL_NIKO] = mYBellKeyboard[NIKO_SLIDE_MODE_A]; - } - } - else{ - keyList[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[NIKO_SLIDE_MODE_TOP]; - keyListOn[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[NIKO_SLIDE_MODE_A]; - } + private void changeNicoBellLayout() { + Keyboard[][] keyList, keyListOn; + keyList = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_OFF]; + keyListOn = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON]; + if (false == mChangeBellMode) { + keyList[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[NIKO_SLIDE_MODE_TOP]; + if (false == mChangeYLineBellMode) { + keyListOn[KEYMODE_JA_FULL_NIKO] = mNikoKeyboard[NIKO_SLIDE_MODE_A]; + } + else{ + keyListOn[KEYMODE_JA_FULL_NIKO] = mYBellKeyboard[NIKO_SLIDE_MODE_A]; + } + } + else{ + keyList[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[NIKO_SLIDE_MODE_TOP]; + keyListOn[KEYMODE_JA_FULL_NIKO] = mBellKeyboard[NIKO_SLIDE_MODE_A]; + } - } + } /************************************************* * flick mode diff --git a/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java b/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java index d55d2b0..0cc1569 100644 --- a/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java +++ b/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java @@ -72,6 +72,7 @@ public class NicoWnnJAJP extends NicoWnn { * Use with {@code OpenWnn.CHANGE_MODE} event. */ public static final int ENGINE_MODE_SYMBOL = 104; + public static final int ENGINE_MODE_DOCOMOSYMBOL = 107; /** * Mode of the convert engine (Keyboard type is QWERTY). @@ -170,6 +171,7 @@ public class NicoWnnJAJP extends NicoWnn { /** Definition for {@code EngineState.temporaryMode} (change to the symbol dictionary) */ public static final int TEMPORARY_DICTIONARY_MODE_SYMBOL = 1; + public static final int TEMPORARY_DICTIONARY_MODE_DOCOMOSYMBOL = 3; /** Definition for {@code EngineState.temporaryMode} (change to the user dictionary) */ public static final int TEMPORARY_DICTIONARY_MODE_USER = 2; @@ -285,7 +287,7 @@ public class NicoWnnJAJP extends NicoWnn { /** Symbol lists to display when the symbol key is pressed */ private static final String[] SYMBOL_LISTS = { - SymbolList.SYMBOL_JAPANESE_FACE, SymbolList.SYMBOL_JAPANESE, SymbolList.SYMBOL_ENGLISH + SymbolList.SYMBOL_JAPANESE_FACE, SymbolList.SYMBOL_JAPANESE, SymbolList.SYMBOL_ENGLISH, SymbolList.SYMBOL_DOCOMO_EMOJI }; /** Current symbol list */ @@ -652,7 +654,7 @@ public class NicoWnnJAJP extends NicoWnn { case NicoWnnEvent.CHANGE_MODE: changeEngineMode(ev.mode); - if (!(ev.mode == ENGINE_MODE_SYMBOL || ev.mode == ENGINE_MODE_EISU_KANA)) { + if (!(ev.mode == ENGINE_MODE_SYMBOL || ev.mode == ENGINE_MODE_DOCOMOSYMBOL || ev.mode == ENGINE_MODE_EISU_KANA)) { initializeScreen(); } return true; @@ -1704,6 +1706,15 @@ public class NicoWnnJAJP extends NicoWnn { } return; + case ENGINE_MODE_DOCOMOSYMBOL: + if (mEnableSymbolList && !mDirectInputMode) { + state.temporaryMode = EngineState.TEMPORARY_DICTIONARY_MODE_DOCOMOSYMBOL; + updateEngineState(state); + updateViewStatusForPrediction(true, true); + } + return; + + default: break; } @@ -1836,6 +1847,13 @@ public class NicoWnnJAJP extends NicoWnn { breakSequence(); break; + case EngineState.TEMPORARY_DICTIONARY_MODE_DOCOMOSYMBOL: + mConverterSymbolEngineBack.setDictionary(SymbolList.SYMBOL_DOCOMO_EMOJI); + mConverter = mConverterSymbolEngineBack; + mDisableAutoCommitEnglishMask |= AUTO_COMMIT_ENGLISH_SYMBOL; + breakSequence(); + break; + default: break; } diff --git a/src/com/hiroshica/android/input/nicownn2/SymbolList.java b/src/com/hiroshica/android/input/nicownn2/SymbolList.java index 31170ef..1711090 100644 --- a/src/com/hiroshica/android/input/nicownn2/SymbolList.java +++ b/src/com/hiroshica/android/input/nicownn2/SymbolList.java @@ -59,6 +59,9 @@ public class SymbolList implements WnnEngine { /** Key string to get face mark list for Japanese */ public static final String SYMBOL_JAPANESE_FACE = "j_face"; + /** Key string to get face mark list for Japanese */ + public static final String SYMBOL_DOCOMO_EMOJI = "d_emoji"; + /** The name of XML tag key */ private static final String XMLTAG_KEY = "string"; @@ -102,6 +105,7 @@ public class SymbolList implements WnnEngine { mSymbols.put(SYMBOL_ENGLISH, getXmlfile(R.xml.symbols_latin1_list)); mSymbols.put(SYMBOL_JAPANESE, getXmlfile(R.xml.symbols_japan_list)); mSymbols.put(SYMBOL_JAPANESE_FACE, getXmlfile(R.xml.symbols_japan_face_list)); + mSymbols.put(SYMBOL_DOCOMO_EMOJI, getXmlfile(R.xml.symbols_docomo_emoji_list)); mCurrentList = mSymbols.get(SYMBOL_ENGLISH); break; diff --git a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java index 6fc2ea6..850d237 100644 --- a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java +++ b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java @@ -17,6 +17,7 @@ package com.hiroshica.android.input.nicownn2; import java.util.ArrayList; +import java.util.HashMap; import android.content.Context; import android.content.SharedPreferences; @@ -161,71 +162,138 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture /** general infomation about a display */ private final DisplayMetrics mMetrics = new DisplayMetrics(); + // docomo emoji hashmap + private static final HashMap DOCOMO_EMOJI_TABLE = new HashMap() {{ + put("\uE63E", R.drawable.docomo_1); put("\uE63F", R.drawable.docomo_2); put("\uE640", R.drawable.docomo_3); put("\uE641", R.drawable.docomo_4); + put("\uE642", R.drawable.docomo_5); put("\uE643", R.drawable.docomo_6); put("\uE644", R.drawable.docomo_7); put("\uE645", R.drawable.docomo_8); + put("\uE646", R.drawable.docomo_9); put("\uE647", R.drawable.docomo_10); put("\uE648", R.drawable.docomo_11); put("\uE649", R.drawable.docomo_12); + put("\uE64A", R.drawable.docomo_13); put("\uE64B", R.drawable.docomo_14); put("\uE64C", R.drawable.docomo_15); put("\uE64D", R.drawable.docomo_16); + put("\uE64E", R.drawable.docomo_17); put("\uE64F", R.drawable.docomo_18); put("\uE650", R.drawable.docomo_19); put("\uE651", R.drawable.docomo_20); + put("\uE652", R.drawable.docomo_21); put("\uE653", R.drawable.docomo_22); put("\uE654", R.drawable.docomo_23); put("\uE655", R.drawable.docomo_24); + put("\uE656", R.drawable.docomo_25); put("\uE657", R.drawable.docomo_26); put("\uE658", R.drawable.docomo_27); put("\uE659", R.drawable.docomo_28); + put("\uE65A", R.drawable.docomo_29); put("\uE65B", R.drawable.docomo_30); put("\uE65C", R.drawable.docomo_31); put("\uE65D", R.drawable.docomo_32); + put("\uE65E", R.drawable.docomo_33); put("\uE65F", R.drawable.docomo_34); put("\uE660", R.drawable.docomo_35); put("\uE661", R.drawable.docomo_36); + put("\uE662", R.drawable.docomo_37); put("\uE663", R.drawable.docomo_38); put("\uE664", R.drawable.docomo_39); put("\uE665", R.drawable.docomo_40); + put("\uE666", R.drawable.docomo_41); put("\uE667", R.drawable.docomo_42); put("\uE668", R.drawable.docomo_43); put("\uE669", R.drawable.docomo_44); + put("\uE66A", R.drawable.docomo_45); put("\uE66B", R.drawable.docomo_46); put("\uE66C", R.drawable.docomo_47); put("\uE66D", R.drawable.docomo_48); + put("\uE66E", R.drawable.docomo_49); put("\uE66F", R.drawable.docomo_50); put("\uE670", R.drawable.docomo_51); put("\uE671", R.drawable.docomo_52); + put("\uE672", R.drawable.docomo_53); put("\uE673", R.drawable.docomo_54); put("\uE674", R.drawable.docomo_55); put("\uE675", R.drawable.docomo_56); + put("\uE676", R.drawable.docomo_57); put("\uE677", R.drawable.docomo_58); put("\uE678", R.drawable.docomo_59); put("\uE679", R.drawable.docomo_60); + put("\uE67A", R.drawable.docomo_61); put("\uE67B", R.drawable.docomo_62); put("\uE67C", R.drawable.docomo_63); put("\uE67D", R.drawable.docomo_64); + put("\uE67E", R.drawable.docomo_65); put("\uE67F", R.drawable.docomo_66); put("\uE680", R.drawable.docomo_67); put("\uE681", R.drawable.docomo_68); + put("\uE682", R.drawable.docomo_69); put("\uE683", R.drawable.docomo_70); put("\uE684", R.drawable.docomo_71); put("\uE685", R.drawable.docomo_72); + put("\uE686", R.drawable.docomo_73); put("\uE687", R.drawable.docomo_74); put("\uE688", R.drawable.docomo_75); put("\uE689", R.drawable.docomo_76); + put("\uE68A", R.drawable.docomo_77); put("\uE68B", R.drawable.docomo_78); put("\uE68C", R.drawable.docomo_79); put("\uE68D", R.drawable.docomo_80); + put("\uE68E", R.drawable.docomo_81); put("\uE68F", R.drawable.docomo_82); put("\uE690", R.drawable.docomo_83); put("\uE691", R.drawable.docomo_84); + put("\uE692", R.drawable.docomo_85); put("\uE693", R.drawable.docomo_86); put("\uE694", R.drawable.docomo_87); put("\uE695", R.drawable.docomo_88); + put("\uE696", R.drawable.docomo_89); put("\uE697", R.drawable.docomo_90); put("\uE698", R.drawable.docomo_91); put("\uE699", R.drawable.docomo_92); + put("\uE69A", R.drawable.docomo_93); put("\uE69B", R.drawable.docomo_94); put("\uE69C", R.drawable.docomo_95); put("\uE69D", R.drawable.docomo_96); + put("\uE69E", R.drawable.docomo_97); put("\uE69F", R.drawable.docomo_98); put("\uE6A0", R.drawable.docomo_99); put("\uE6A1", R.drawable.docomo_100); + put("\uE6A2", R.drawable.docomo_101); put("\uE6A3", R.drawable.docomo_102); put("\uE6A4", R.drawable.docomo_103); put("\uE6A5", R.drawable.docomo_104); + put("\uE6CE", R.drawable.docomo_105); put("\uE6CF", R.drawable.docomo_106); put("\uE6D0", R.drawable.docomo_107); put("\uE6D1", R.drawable.docomo_108); + put("\uE6D2", R.drawable.docomo_109); put("\uE6D3", R.drawable.docomo_110); put("\uE6D4", R.drawable.docomo_111); put("\uE6D5", R.drawable.docomo_112); + put("\uE6D6", R.drawable.docomo_113); put("\uE6D7", R.drawable.docomo_114); put("\uE6D8", R.drawable.docomo_115); put("\uE6D9", R.drawable.docomo_116); + put("\uE6DA", R.drawable.docomo_117); put("\uE6DB", R.drawable.docomo_118); put("\uE6DC", R.drawable.docomo_119); put("\uE6DD", R.drawable.docomo_120); + put("\uE6DE", R.drawable.docomo_121); put("\uE6DF", R.drawable.docomo_122); put("\uE6E0", R.drawable.docomo_123); put("\uE6E1", R.drawable.docomo_124); + put("\uE6E2", R.drawable.docomo_125); put("\uE6E3", R.drawable.docomo_126); put("\uE6E4", R.drawable.docomo_127); put("\uE6E5", R.drawable.docomo_128); + put("\uE6E6", R.drawable.docomo_129); put("\uE6E7", R.drawable.docomo_130); put("\uE6E8", R.drawable.docomo_131); put("\uE6E9", R.drawable.docomo_132); + put("\uE6EA", R.drawable.docomo_133); put("\uE6EB", R.drawable.docomo_134); put("\uE70B", R.drawable.docomo_135); put("\uE6EC", R.drawable.docomo_136); + put("\uE6ED", R.drawable.docomo_137); put("\uE6EE", R.drawable.docomo_138); put("\uE6EF", R.drawable.docomo_139); put("\uE6F0", R.drawable.docomo_140); + put("\uE6F1", R.drawable.docomo_141); put("\uE6F2", R.drawable.docomo_142); put("\uE6F3", R.drawable.docomo_143); put("\uE6F4", R.drawable.docomo_144); + put("\uE6F5", R.drawable.docomo_145); put("\uE6F6", R.drawable.docomo_146); put("\uE6F7", R.drawable.docomo_147); put("\uE6F8", R.drawable.docomo_148); + put("\uE6F9", R.drawable.docomo_149); put("\uE6FA", R.drawable.docomo_150); put("\uE6FB", R.drawable.docomo_151); put("\uE6FC", R.drawable.docomo_152); + put("\uE6FD", R.drawable.docomo_153); put("\uE6FE", R.drawable.docomo_154); put("\uE6FF", R.drawable.docomo_155); put("\uE700", R.drawable.docomo_156); + put("\uE701", R.drawable.docomo_157); put("\uE702", R.drawable.docomo_158); put("\uE703", R.drawable.docomo_159); put("\uE704", R.drawable.docomo_160); + put("\uE705", R.drawable.docomo_161); put("\uE706", R.drawable.docomo_162); put("\uE707", R.drawable.docomo_163); put("\uE708", R.drawable.docomo_164); + put("\uE709", R.drawable.docomo_165); put("\uE70A", R.drawable.docomo_166); put("\uE6AC", R.drawable.docomo_167); put("\uE6AD", R.drawable.docomo_168); + put("\uE6AE", R.drawable.docomo_169); put("\uE6B1", R.drawable.docomo_170); put("\uE6B2", R.drawable.docomo_171); put("\uE6B3", R.drawable.docomo_172); + put("\uE6B7", R.drawable.docomo_173); put("\uE6B8", R.drawable.docomo_174); put("\uE6B9", R.drawable.docomo_175); put("\uE6BA", R.drawable.docomo_176); + put("\uE70C", R.drawable.docomo_ex1); put("\uE70D", R.drawable.docomo_ex2); put("\uE70E", R.drawable.docomo_ex3); put("\uE70F", R.drawable.docomo_ex4); + put("\uE710", R.drawable.docomo_ex5); put("\uE711", R.drawable.docomo_ex6); put("\uE712", R.drawable.docomo_ex7); put("\uE713", R.drawable.docomo_ex8); + put("\uE714", R.drawable.docomo_ex9); put("\uE715", R.drawable.docomo_ex10); put("\uE716", R.drawable.docomo_ex11); put("\uE717", R.drawable.docomo_ex12); + put("\uE718", R.drawable.docomo_ex13); put("\uE719", R.drawable.docomo_ex14); put("\uE71A", R.drawable.docomo_ex15); put("\uE71B", R.drawable.docomo_ex16); + put("\uE71C", R.drawable.docomo_ex17); put("\uE71D", R.drawable.docomo_ex18); put("\uE71E", R.drawable.docomo_ex19); put("\uE71F", R.drawable.docomo_ex20); + put("\uE720", R.drawable.docomo_ex21); put("\uE721", R.drawable.docomo_ex22); put("\uE722", R.drawable.docomo_ex23); put("\uE723", R.drawable.docomo_ex24); + put("\uE724", R.drawable.docomo_ex25); put("\uE725", R.drawable.docomo_ex26); put("\uE726", R.drawable.docomo_ex27); put("\uE727", R.drawable.docomo_ex28); + put("\uE728", R.drawable.docomo_ex29); put("\uE729", R.drawable.docomo_ex30); put("\uE72A", R.drawable.docomo_ex31); put("\uE72B", R.drawable.docomo_ex32); + put("\uE72C", R.drawable.docomo_ex33); put("\uE72D", R.drawable.docomo_ex34); put("\uE72E", R.drawable.docomo_ex35); put("\uE72F", R.drawable.docomo_ex36); + put("\uE730", R.drawable.docomo_ex37); put("\uE731", R.drawable.docomo_ex38); put("\uE732", R.drawable.docomo_ex39); put("\uE733", R.drawable.docomo_ex40); + put("\uE734", R.drawable.docomo_ex41); put("\uE735", R.drawable.docomo_ex42); put("\uE736", R.drawable.docomo_ex43); put("\uE737", R.drawable.docomo_ex44); + put("\uE738", R.drawable.docomo_ex45); put("\uE739", R.drawable.docomo_ex46); put("\uE73A", R.drawable.docomo_ex47); put("\uE73B", R.drawable.docomo_ex48); + put("\uE73C", R.drawable.docomo_ex49); put("\uE73D", R.drawable.docomo_ex50); put("\uE73E", R.drawable.docomo_ex51); put("\uE73F", R.drawable.docomo_ex52); + put("\uE740", R.drawable.docomo_ex53); put("\uE741", R.drawable.docomo_ex54); put("\uE742", R.drawable.docomo_ex55); put("\uE743", R.drawable.docomo_ex56); + put("\uE744", R.drawable.docomo_ex57); put("\uE745", R.drawable.docomo_ex58); put("\uE746", R.drawable.docomo_ex59); put("\uE747", R.drawable.docomo_ex60); + put("\uE748", R.drawable.docomo_ex61); put("\uE749", R.drawable.docomo_ex62); put("\uE74A", R.drawable.docomo_ex63); put("\uE74B", R.drawable.docomo_ex64); + put("\uE74C", R.drawable.docomo_ex65); put("\uE74D", R.drawable.docomo_ex66); put("\uE74E", R.drawable.docomo_ex67); put("\uE74F", R.drawable.docomo_ex68); + put("\uE750", R.drawable.docomo_ex69); put("\uE751", R.drawable.docomo_ex70); put("\uE752", R.drawable.docomo_ex71); put("\uE753", R.drawable.docomo_ex72); + put("\uE754", R.drawable.docomo_ex73); put("\uE755", R.drawable.docomo_ex74); put("\uE756", R.drawable.docomo_ex75); put("\uE757", R.drawable.docomo_ex76); + }}; + /** Event listener for touching a candidate */ private OnTouchListener mCandidateOnTouch = new OnTouchListener() { - public boolean onTouch(View v, MotionEvent event) { - if (mMotionEvent != null) { - return true; - } - - if ((event.getAction() == MotionEvent.ACTION_UP) - && (v instanceof TextView)) { - Drawable d = v.getBackground(); - if (d != null) { - d.setState(new int[] {}); - } - } - - mMotionEvent = event; - boolean ret = mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CANDIDATE_VIEW_TOUCH)); - mMotionEvent = null; - return ret; - } - }; + public boolean onTouch(View v, MotionEvent event) { + if (mMotionEvent != null) { + return true; + } + + if ((event.getAction() == MotionEvent.ACTION_UP) + && (v instanceof TextView)) { + Drawable d = v.getBackground(); + if (d != null) { + d.setState(new int[] {}); + } + } + + mMotionEvent = event; + boolean ret = mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.CANDIDATE_VIEW_TOUCH)); + mMotionEvent = null; + return ret; + } + }; /** Event listener for clicking a candidate */ private OnClickListener mCandidateOnClick = new OnClickListener() { - public void onClick(View v) { - if (!v.isShown()) { - return; - } + public void onClick(View v) { + if (!v.isShown()) { + return; + } - if (v instanceof TextView) { - TextView text = (TextView)v; - int wordcount = text.getId(); - WnnWord word = null; - word = mWnnWordArray.get(wordcount); - selectCandidate(word); - } - } - }; + if (v instanceof TextView) { + TextView text = (TextView)v; + int wordcount = text.getId(); + WnnWord word = null; + word = mWnnWordArray.get(wordcount); + selectCandidate(word); + } + } + }; /** Event listener for long-clicking a candidate */ private OnLongClickListener mCandidateOnLongClick = new OnLongClickListener() { - public boolean onLongClick(View v) { - if (mViewScaleUp == null) { - return false; - } - - if (!v.isShown()) { - return true; - } - - Drawable d = v.getBackground(); - if (d != null) { - if(d.getState().length == 0){ - return true; - } - } + public boolean onLongClick(View v) { + if (mViewScaleUp == null) { + return false; + } + + if (!v.isShown()) { + return true; + } + + Drawable d = v.getBackground(); + if (d != null) { + if(d.getState().length == 0){ + return true; + } + } - int wordcount = ((TextView)v).getId(); - mWord = mWnnWordArray.get(wordcount); - setViewScaleUp(true, mWord); + int wordcount = ((TextView)v).getId(); + mWord = mWnnWordArray.get(wordcount); + setViewScaleUp(true, mWord); - return true; - } - }; + return true; + } + }; /** @@ -283,43 +351,43 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture mReadMoreButton = (ImageView)mViewBody.findViewById(R.id.read_more_text); mReadMoreButton.setOnTouchListener(new View.OnTouchListener() { - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - if (mIsFullView) { - mReadMoreButton.setImageResource(R.drawable.cand_down_press); - } else { - mReadMoreButton.setImageResource(R.drawable.cand_up_press); - } - break; - case MotionEvent.ACTION_UP: - if (mIsFullView) { - mReadMoreButton.setImageResource(R.drawable.cand_down); - } else { - mReadMoreButton.setImageResource(R.drawable.cand_up); - } - break; - default: - break; - } - return false; - } - }); + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + if (mIsFullView) { + mReadMoreButton.setImageResource(R.drawable.cand_down_press); + } else { + mReadMoreButton.setImageResource(R.drawable.cand_up_press); + } + break; + case MotionEvent.ACTION_UP: + if (mIsFullView) { + mReadMoreButton.setImageResource(R.drawable.cand_down); + } else { + mReadMoreButton.setImageResource(R.drawable.cand_up); + } + break; + default: + break; + } + return false; + } + }); mReadMoreButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - if (!v.isShown()) { - return; - } - - if (mIsFullView) { - mIsFullView = false; - mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.LIST_CANDIDATES_NORMAL)); - } else { - mIsFullView = true; - mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.LIST_CANDIDATES_FULL)); - } - } - }); + public void onClick(View v) { + if (!v.isShown()) { + return; + } + + if (mIsFullView) { + mIsFullView = false; + mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.LIST_CANDIDATES_NORMAL)); + } else { + mIsFullView = true; + mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.LIST_CANDIDATES_FULL)); + } + } + }); setViewType(CandidatesViewManager.VIEW_TYPE_CLOSE); @@ -331,19 +399,19 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture /* select button */ Button b = (Button)scaleUp.findViewById(R.id.candidate_select); b.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - selectCandidate(mWord); - } - }); + public void onClick(View v) { + selectCandidate(mWord); + } + }); /* cancel button */ b = (Button)scaleUp.findViewById(R.id.candidate_cancel); b.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - setViewLayout(CandidatesViewManager.VIEW_TYPE_NORMAL); - mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.UPDATE_CANDIDATE)); - } - }); + public void onClick(View v) { + setViewLayout(CandidatesViewManager.VIEW_TYPE_NORMAL); + mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.UPDATE_CANDIDATE)); + } + }); return mViewBody; } @@ -668,7 +736,12 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture } else if (word.candidate.equals("\u3000" /* full-width space */)) { span = new ImageSpan(mWnn, R.drawable.word_full_space, DynamicDrawableSpan.ALIGN_BASELINE); - } + } + // check docomo emoji + Integer getres = getDocomoEmojiRes(word); + if (null != getres) { + span = new ImageSpan(mWnn, getres.intValue(), DynamicDrawableSpan.ALIGN_BASELINE); + } if (span != null) { SpannableString spannable = new SpannableString(" "); @@ -678,26 +751,26 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture mWnnWordArray.add(mWordCount, word); mWordCount++; - } - - /** - * Create a view for a candidate. - * @return the view - */ - private TextView createCandidateView() { - TextView text = new TextView(mViewBodyScroll.getContext()); - text.setTextSize(20); - text.setBackgroundResource(R.drawable.cand_back); - text.setGravity(Gravity.CENTER); - text.setSingleLine(); - text.setPadding(4, 4, 4, 4); - text.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - 1.0f)); - text.setMinHeight(getCandidateMinimumHeight()); - text.setMinimumWidth(getCandidateMinimumWidth()); - return text; - } + } + + /** + * Create a view for a candidate. + * @return the view + */ + private TextView createCandidateView() { + TextView text = new TextView(mViewBodyScroll.getContext()); + text.setTextSize(20); + text.setBackgroundResource(R.drawable.cand_back); + text.setGravity(Gravity.CENTER); + text.setSingleLine(); + text.setPadding(4, 4, 4, 4); + text.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + 1.0f)); + text.setMinHeight(getCandidateMinimumHeight()); + text.setMinimumWidth(getCandidateMinimumWidth()); + return text; + } /** * Display {@code mReadMoreText} if there are more candidates. @@ -966,4 +1039,12 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture private int getCandidateMinimumHeight() { return (int)(CANDIDATE_MINIMUM_HEIGHT * mMetrics.density); } + + /** + * get docomo-emoji resource + */ + private Integer getDocomoEmojiRes(WnnWord word) { + return DOCOMO_EMOJI_TABLE.get(word.candidate); + } + } -- 2.11.0