Ver.1.3.0.4:

・Android1.5のサポート復帰
・ニコ２に追加した文字盤が反応していなかったバグの修正

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0451271..46fbfdf 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,86 +1,88 @@
 <!--
- Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
+   Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
 
- 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
+   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
+   http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.hiroshica.android.input.nicownn2"
-         android:versionCode="1302" android:versionName="1.3.0.2">
+         android:versionCode="1304" android:versionName="1.3.0.4">
   <uses-permission xmlns:android="http://schemas.android.com/apk/res/android" android:name="android.permission.VIBRATE"/>
-    <application android:icon="@drawable/icon" android:label="NicoWnn">
-
-      <!--
-         <intent-filter>
-           <action android:name="com.adamrocker.android.simeji.ACTION_INTERCEPT" />
-           <category android:name="com.adamrocker.android.simeji.REPLACE" />
-           <category android:name="android.intent.category.DEFAULT" />
-         </intent-filter>
-         -->
-
-        <service android:name="NicoWnnJAJP" android:label="nicoWnn IME"
-                android:permission="android.permission.BIND_INPUT_METHOD"
-                android:id="@+id/nicownn_japanese">
-          <intent-filter>
-            <action android:name="android.view.InputMethod" />
-          </intent-filter>
-          <meta-data android:name="android.view.im" android:resource="@xml/method_ja" />
-
-        </service>
-
-        <activity android:name="NicoWnnControlPanelJAJP"
-                android:label="@string/preference_ime_setting_app" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="NicoWnnMain" android:label="@string/nicownn_title" >
-          <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-          </intent-filter>
-        </activity>
-       
-
-       <activity android:name="com.hiroshica.android.input.nicownn2.JAJP.UserDictionaryToolsListJAJP" /> 
-
-       <activity android:name="com.hiroshica.android.input.nicownn2.JAJP.UserDictionaryToolsEditJAJP" android:label="@string/user_dictionary_edit_words" /> 
-
-       <activity android:name="com.hiroshica.android.input.nicownn2.EN.UserDictionaryToolsListEN" /> 
-
-       <activity android:name="com.hiroshica.android.input.nicownn2.EN.UserDictionaryToolsEditEN" android:label="@string/user_dictionary_edit_words" /> 
-
-       <activity android:name="com.hiroshica.android.input.nicownn2.NicoWnnMushUp" />
-       
-       <!--
-       <activity android:name="com.hiroshica.android.input.nicownn2.NicoWnnMushUp">
-         <intent-filter>
-           <action android:name="com.adamrocker.android.simeji.ACTION_INTERCEPT" />
-           <category android:name="com.adamrocker.android.simeji.REPLACE" />
-           <category android:name="android.intent.category.DEFAULT" />
-         </intent-filter>
-        </activity>
-       -->
-       
-    </application>
-       <supports-screens
-               android:largeScreens="true"
-               android:normalScreens="true"
-               android:smallScreens="true"
-               android:anyDensity="true" />
-               
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-sdk android:minSdkVersion="4" />
+  <application android:icon="@drawable/icon" android:label="NicoWnn">
+
+    <!--
+       <intent-filter>
+        <action android:name="com.adamrocker.android.simeji.ACTION_INTERCEPT" />
+        <category android:name="com.adamrocker.android.simeji.REPLACE" />
+        <category android:name="android.intent.category.DEFAULT" />
+       </intent-filter>
+       -->
+
+    <service android:name="NicoWnnJAJP" android:label="nicoWnn IME"
+            android:permission="android.permission.BIND_INPUT_METHOD"
+            android:id="@+id/nicownn_japanese">
+      <intent-filter>
+        <action android:name="android.view.InputMethod" />
+      </intent-filter>
+      <meta-data android:name="android.view.im" android:resource="@xml/method_ja" />
+
+    </service>
+
+    <activity android:name="NicoWnnControlPanelJAJP"
+              android:label="@string/preference_ime_setting_app" >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="NicoWnnMain" android:label="@string/nicownn_title" >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    
+
+    <activity android:name="com.hiroshica.android.input.nicownn2.JAJP.UserDictionaryToolsListJAJP" /> 
+
+    <activity android:name="com.hiroshica.android.input.nicownn2.JAJP.UserDictionaryToolsEditJAJP" android:label="@string/user_dictionary_edit_words" /> 
+
+    <activity android:name="com.hiroshica.android.input.nicownn2.EN.UserDictionaryToolsListEN" /> 
+
+    <activity android:name="com.hiroshica.android.input.nicownn2.EN.UserDictionaryToolsEditEN" android:label="@string/user_dictionary_edit_words" /> 
+
+    <activity android:name="com.hiroshica.android.input.nicownn2.NicoWnnMushUp" />
+    
+    <!--
+       <activity android:name="com.hiroshica.android.input.nicownn2.NicoWnnMushUp">
+        <intent-filter>
+          <action android:name="com.adamrocker.android.simeji.ACTION_INTERCEPT" />
+          <category android:name="com.adamrocker.android.simeji.REPLACE" />
+          <category android:name="android.intent.category.DEFAULT" />
+        </intent-filter>
+       </activity>
+       -->
+  </application>
+
+  <!--
+  <supports-screens
+     android:largeScreens="true"
+     android:normalScreens="true"
+     android:smallScreens="true"
+     android:anyDensity="true" />
+  -->
+  
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-sdk android:minSdkVersion="3" />
 </manifest> 
 

diff --git a/assets/openwnn_main.html b/assets/openwnn_main.html
index 4279ebb..ff4cd77 100644 (file)
--- a/assets/openwnn_main.html
+++ b/assets/openwnn_main.html
@@ -5,7 +5,7 @@
   </head>
   <body>
     <div style="background-color: rgb(0, 204, 204);">
-      <big>ニコWnnについて　Ver.1.3.0.2</big><br>
+      <big>ニコWnnについて　Ver.1.3.0.4</big><br>
     </div>
     <br>
     ニコWnnはオープンソースとして公開されている<br>
@@ -41,9 +41,9 @@
     <div style="background-color: rgb(255, 255, 51);">
       <big>変更点</big><br>
     </div>
-    Ver.1.3.0.2<br>
-    ・フリックの選択文字が他ソフトとずれているのを修正<br>
-    ・全角カナ時にフリックできないバグ修正<br>
+    Ver.1.3.0.4<br>
+    ・Android1.5のサポート復帰<br>
+    ・ニコ２に追加した文字盤が反応していなかったバグの修正<br>
     <br>
 <!--
 -->
@@ -66,6 +66,10 @@
       <big>履歴</big><br>
     </div>
 <!-- -->
+    Ver.1.3.0.2<br>
+    ・フリックの選択文字が他ソフトとずれているのを修正<br>
+    ・全角カナ時にフリックできないバグ修正<br>
+    <br>
     Ver.1.3.0.1<br>
     ・トグルモードの再登録とフリック対応<br>
     ・フリック時の各種バグ修正<br>

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7f887fc..f2f3fb9 100644 (file)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
+   Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
 
- 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
+   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
+   http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
 <resources>
-    <dimen name="key_height">48dip</dimen>
-    <dimen name="key_height_landscape">38dip</dimen>
+  <!--
+     <dimen name="key_height">48dip</dimen>
+     <dimen name="key_height_landscape">38dip</dimen>
 
-    <dimen name="key_mid_height">54dip</dimen>
-    <dimen name="key_mid_height_landscape">44dip</dimen>
+     <dimen name="key_mid_height">54dip</dimen>
+     <dimen name="key_mid_height_landscape">44dip</dimen>
 
-    <dimen name="key_large_height">60dip</dimen>
-    <dimen name="key_large_height_landscape">50dip</dimen>
+     <dimen name="key_large_height">60dip</dimen>
+     <dimen name="key_large_height_landscape">50dip</dimen>
+     -->
+  <dimen name="key_height">48px</dimen>
+  <dimen name="key_height_landscape">38px</dimen>
+  
+  <dimen name="key_mid_height">54px</dimen>
+  <dimen name="key_mid_height_landscape">44px</dimen>
+  
+  <dimen name="key_large_height">60px</dimen>
+  <dimen name="key_large_height_landscape">50px</dimen>
 
-    <dimen name="candidate_font_size">20sp</dimen>
-    <dimen name="candidate_delete_word_size">32dip</dimen>
-    <dimen name="candidate_delete_word_size_landscape">28dip</dimen>
-    <dimen name="bubble_pointer_offset">22dip</dimen>
+  <dimen name="candidate_font_size">20sp</dimen>
+  <dimen name="candidate_delete_word_size">32dip</dimen>
+  <dimen name="candidate_delete_word_size_landscape">28dip</dimen>
+  <dimen name="bubble_pointer_offset">22dip</dimen>
 </resources>

diff --git a/res/xml/key_nico2_input_s.xml b/res/xml/key_nico2_input_s.xml
index c762281..7db58de 100644 (file)
--- a/res/xml/key_nico2_input_s.xml
+++ b/res/xml/key_nico2_input_s.xml
@@ -29,7 +29,7 @@
         <Key android:codes="-214" android:keyIcon="@drawable/key_12key_del" android:iconPreview="@drawable/key_12key_del_b" android:isRepeatable="true"/>
     </Row>
     <Row>
-        <Key android:codes="-310" android:keyLabel="："/>
+        <Key android:codes="-206" android:keyLabel="："/>
         <Key android:codes="-207" android:keyLabel="/"/>
         <Key android:codes="-208" android:keyLabel="3"/>
         <Key android:codes="-209" android:keyLabel="せ"/>

diff --git a/res/xml/key_nico2_input_s_land.xml b/res/xml/key_nico2_input_s_land.xml
index 550d425..02eefe7 100644 (file)
--- a/res/xml/key_nico2_input_s_land.xml
+++ b/res/xml/key_nico2_input_s_land.xml
@@ -29,7 +29,7 @@
         <Key android:codes="-214" android:keyIcon="@drawable/key_12key_del" android:iconPreview="@drawable/key_12key_del_b" android:isRepeatable="true"/>
     </Row>
     <Row>
-        <Key android:codes="-310" android:keyLabel="："/>
+        <Key android:codes="-206" android:keyLabel="："/>
         <Key android:codes="-207" android:keyLabel="/"/>
         <Key android:codes="-208" android:keyLabel="3"/>
         <Key android:codes="-209" android:keyLabel="せ"/>

diff --git a/res/xml/key_nico2_s.xml b/res/xml/key_nico2_s.xml
index be9cfbe..7db58de 100644 (file)
--- a/res/xml/key_nico2_s.xml
+++ b/res/xml/key_nico2_s.xml
@@ -29,7 +29,7 @@
         <Key android:codes="-214" android:keyIcon="@drawable/key_12key_del" android:iconPreview="@drawable/key_12key_del_b" android:isRepeatable="true"/>
     </Row>
     <Row>
-        <Key android:codes="-310" android:keyLabel=" "/>
+        <Key android:codes="-206" android:keyLabel="："/>
         <Key android:codes="-207" android:keyLabel="/"/>
         <Key android:codes="-208" android:keyLabel="3"/>
         <Key android:codes="-209" android:keyLabel="せ"/>

diff --git a/res/xml/key_nico2_s_land.xml b/res/xml/key_nico2_s_land.xml
index 3fb91d5..02eefe7 100644 (file)
--- a/res/xml/key_nico2_s_land.xml
+++ b/res/xml/key_nico2_s_land.xml
@@ -29,7 +29,7 @@
         <Key android:codes="-214" android:keyIcon="@drawable/key_12key_del" android:iconPreview="@drawable/key_12key_del_b" android:isRepeatable="true"/>
     </Row>
     <Row>
-        <Key android:codes="-310" android:keyLabel=" "/>
+        <Key android:codes="-206" android:keyLabel="："/>
         <Key android:codes="-207" android:keyLabel="/"/>
         <Key android:codes="-208" android:keyLabel="3"/>
         <Key android:codes="-209" android:keyLabel="せ"/>

diff --git a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
index e559120..3ca2890 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
+++ b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
@@ -1387,7 +1387,8 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
         */
        public static int getCandidateMinimumHeight() {
         //return (int)(CANDIDATE_MINIMUM_HEIGHT * mMetrics.density);
-               return (int)((float)candidateViewDataTable[mCandidateViewHeightIndex] * mMetrics.density);
+               //return (int)((float)candidateViewDataTable[mCandidateViewHeightIndex] * mMetrics.density);
+               return (int)((float)candidateViewDataTable[mCandidateViewHeightIndex]);
        }
 
        /**