2 files changed, 38 insertions, 21 deletions
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 17ad3fc72..e5ad75bca 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -190,6 +190,7 @@ public class LatinIME extends InputMethodService
         }
         if (!mTutorialShownBefore && mTutorial != null) {
             mTutorial.close(false);
+            mTutorial = null;
         }
         super.onConfigurationChanged(conf);
     }
@@ -299,23 +300,35 @@ public class LatinIME extends InputMethodService
         if (mSuggest != null) {
             mSuggest.setCorrectionMode(mCorrectionMode);
         }
+        mPredictionOn = mPredictionOn && mCorrectionMode > 0;
         if (!mTutorialShownBefore && mTutorial == null) {
-            mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000);
+            mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 
+                    mInputView.isShown() ? 100 : 3000);
         }
-        mPredictionOn = mPredictionOn && mCorrectionMode > 0;
         if (TRACE) Debug.startMethodTracing("latinime");
     }
 
     @Override
+    public void onWindowShown() {
+        super.onWindowShown();
+        // Bring the tutorial up faster, if window just shown
+        if (!mTutorialShownBefore && mTutorial == null) {
+            mHandler.removeMessages(MSG_CHECK_TUTORIAL);
+            mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000);
+        }
+    }
+    
+    @Override
     public void onFinishInput() {
         super.onFinishInput();
 
         if (mInputView != null) {
             mInputView.closing();
         }
-        if (!mTutorialShownBefore && mTutorial != null) {
-            mTutorial.close(false);
-        }        
+//        if (!mTutorialShownBefore && mTutorial != null) {
+//            mTutorial.close(false);
+//            mTutorial = null;
+//        }        
     }
 
     @Override
@@ -346,6 +359,10 @@ public class LatinIME extends InputMethodService
     @Override
     public void hideWindow() {
         if (TRACE) Debug.stopMethodTracing();
+        if (!mTutorialShownBefore && mTutorial != null) {
+            mTutorial.close(false);
+            mTutorial = null;
+        }
         super.hideWindow();
         TextEntryState.endSession();
     }
diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/src/com/android/inputmethod/latin/Tutorial.java
index 2b3138bf9..d944d17bf 100644
--- a/src/com/android/inputmethod/latin/Tutorial.java
+++ b/src/com/android/inputmethod/latin/Tutorial.java
@@ -168,22 +168,22 @@ public class Tutorial {
                 R.string.tip_dismiss,
                 false, true);
         mBubbles.add(b0);
-        Bubble b1 = new Bubble(context, inputView, 
-                R.drawable.dialog_bubble_step03, 
-                (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, 
-                (int) (inputWidth * 0.45),
-                Gravity.TOP | Gravity.RIGHT,
-                R.string.tip_long_press,
-                true, false);
-        mBubbles.add(b1);
-        Bubble b2 = new Bubble(inputView.getContext(), inputView, 
-                R.drawable.dialog_bubble_step04, 
-                inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5,
-                (int) (inputWidth * 0.45),
-                Gravity.BOTTOM | Gravity.LEFT,
-                R.string.tip_access_symbols,
-                true, false);
-        mBubbles.add(b2);
+//        Bubble b1 = new Bubble(context, inputView, 
+//                R.drawable.dialog_bubble_step03, 
+//                (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, 
+//                (int) (inputWidth * 0.45),
+//                Gravity.TOP | Gravity.RIGHT,
+//                R.string.tip_long_press,
+//                true, false);
+//        mBubbles.add(b1);
+//        Bubble b2 = new Bubble(inputView.getContext(), inputView, 
+//                R.drawable.dialog_bubble_step04, 
+//                inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5,
+//                (int) (inputWidth * 0.45),
+//                Gravity.BOTTOM | Gravity.LEFT,
+//                R.string.tip_access_symbols,
+//                true, false);
+//        mBubbles.add(b2);
         mInputView = inputView;
     }