Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a200a9bf authored by Amith Yamasani's avatar Amith Yamasani Committed by The Android Open Source Project
Browse files

Automated import from //branches/donutburger/...@140835,140835

parent 4cc3a58a
Loading
Loading
Loading
Loading
−936 B (100 B)
Loading image diff...
+1 −0
Original line number Diff line number Diff line
@@ -24,4 +24,5 @@
    android:textSize="14sp"
    android:textColor="?android:attr/textColorPrimary"
    android:minWidth="32dip"
    android:gravity="center"
    />
+22 −5
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ public class LatinIME extends InputMethodService
        }
        if (!mTutorialShownBefore && mTutorial != null) {
            mTutorial.close(false);
            mTutorial = null;
        }
        super.onConfigurationChanged(conf);
    }
@@ -299,13 +300,24 @@ 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();
@@ -313,9 +325,10 @@ public class LatinIME extends InputMethodService
        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();
    }
+16 −16
Original line number Diff line number Diff line
@@ -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;
    }