Ver.1.2.3.4:

SystemClock.sleep()をThread.sleep()に置き換えてテストをしてみる

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3fbd6f..229b6ed 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.hiroshica.android.input.nicownn2"
-         android:versionCode="1233" android:versionName="1.2.3.3">
+         android:versionCode="1234" android:versionName="1.2.3.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">
 

diff --git a/src/com/hiroshica/android/input/nicownn2/TextCandidateTask.java b/src/com/hiroshica/android/input/nicownn2/TextCandidateTask.java
index a993fac..295dd66 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/TextCandidateTask.java
+++ b/src/com/hiroshica/android/input/nicownn2/TextCandidateTask.java
@@ -58,7 +58,7 @@ public class TextCandidateTask extends AsyncTask<Integer, Integer, Integer> {
                                }
                        }
                        if (endcount >= maxline) {
-                endTask();
+                //endTask();
                                return 0;
                        }
                        if (true == mIsCancel) {
@@ -77,14 +77,14 @@ public class TextCandidateTask extends AsyncTask<Integer, Integer, Integer> {
             if (true == mIsCancel) {
                 return 1;
             }
-            /*
+
             try {
                 Thread.sleep(kUPDATE_WAIT);
             } catch (Exception e) {
                return 1;
                        }
-            */
-            SystemClock.sleep(kUPDATE_WAIT);
+
+            //SystemClock.sleep(kUPDATE_WAIT);
             count += kUPDATE_WAIT;
        }
        return 0;

diff --git a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
index 8a756d3..6df368a 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
+++ b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
@@ -642,7 +642,12 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                mViewBodyHScroll.scrollTo(0, 0);
                mIsLockHScroll = false;
                /* create background normalview */
-               //int viewWidth = mViewWidth * 2;
+               startCandidateTask();
+       }
+       /*
+        * 
+        */
+       private void startCandidateTask() {
                int viewWidth = mViewWidth * 1000;
                mCandidateTask = new TextCandidateTask(this);
                if (null != mCandidateTask) {
@@ -654,12 +659,6 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
        /*
         * 
         */
-       public void cancelTask() {
-        mIsCancelTask = true;
-       }
-       /*
-        * 
-        */
        public void checkCandidateTask() {
                if (null != mCandidateTask) {
             mCandidateTask.cancel(true);
@@ -674,7 +673,12 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                if (null != mCandidateTask) {
             mCandidateTask.cancel(true);
             while(count > 0) {
-                SystemClock.sleep(20);
+                try {
+                    Thread.sleep(20);
+                } catch (Exception e) {
+                    return;
+                }
+                //SystemClock.sleep(20);
                 if (true == mIsCancelTask) {
                        break;
                 }
@@ -684,6 +688,12 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                }
        }
        /*
+        * cancel callback 
+        */
+       public void cancelTask() {
+        mIsCancelTask = true;
+       }
+       /*
         * 
         */
        synchronized private void createWnnWordArray() {
@@ -897,26 +907,6 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
         */
        public void display1stLastSetup() {
                m1stWordCount = mWordCount;
-               /*
-               if (mWordCount < 1) { // no candidates
-                       if (mAutoHideMode) {
-                               mWnn.setCandidatesViewShown(false);
-                       } else {
-                               mCanReadMore = false;
-                               mIsFullView = false;
-                               setViewLayout(CandidatesViewManager.VIEW_TYPE_NORMAL);
-                       }
-               }
-               else{
-                       mCanReadMore = true;
-               }
-               if (!(mViewBody.isShown())) {
-                       mWnn.setCandidatesViewShown(true);
-               }
-               mTargetScrollWidth = mViewWidth / 2;
-               mViewBodyHScroll.scrollTo(0, 0);
-               mIsLockHScroll = false;
-               */
                mIsActiveTask = false;
        }
        /**
@@ -1241,7 +1231,6 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
 
        /** @see android.view.GestureDetector.OnGestureListener#onDown */
        public boolean onDown(MotionEvent arg0) {
-               checkUpdate1stCandidates(0);
                return false;
        }
 
@@ -1287,12 +1276,6 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                                consumed = true;
                        }
                }
-               //if (arg0 != null && arg1 != null && arg1.getX() > arg0.getX()) {
-               /*
-               if (arg2 > 0) {
-                       checkUpdate1stCandidates(arg2);
-               }
-               */
                return consumed;
        }
 
@@ -1306,37 +1289,8 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                if (mViewBodyVScroll.getScrollY() != 0) {
                        mIsScroll = true;
                }
-               if (MotionEvent.ACTION_MOVE == arg1.getAction()) {
-                       checkUpdate1stCandidates(arg1.getX() - arg0.getX());
-               }
                return false;
        }
-       /*
-        * 
-        */
-       private void checkUpdate1stCandidates(float distx) {
-               if (true == mIsFullView) {
-                       return;
-               }
-               /*
-<              if (true == mIsActiveTask) {
-                       return;
-               }
-               boolean update = false;
-               int size       = mWnnWordArray.size();
-               int getscroll  = mViewBodyHScroll.getScrollX();
-               getscroll += (int)distx;
-               while ((getscroll >= mTargetScrollWidth) && (m1stWordCount < size)) {
-                       display1stCandidates(mConverter, mViewWidth);
-                       mTargetScrollWidth += mViewWidth;
-                       update = true;
-               }
-               if (true == update) {
-                       mViewCandidateList1st.invalidate();
-               }
-               */
-       }
-
        /** @see android.view.GestureDetector.OnGestureListener#onShowPress */
        public void onShowPress(MotionEvent arg0) {
        }