nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

main
Amith Yamasani 2009-03-24 18:40:11 -07:00 committed by The Android Open Source Project
parent 4cc3a58a15
commit a200a9bff7
4 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/dialog_bubble_step02.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 100 B

1
res/layout/bubble_text.xml
View File

@ -24,4 +24,5 @@
android:textSize="14sp" android:textSize="14sp"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:minWidth="32dip" android:minWidth="32dip"
android:gravity="center"
/> />

27
src/com/android/inputmethod/latin/LatinIME.java
View File

@ -190,6 +190,7 @@ public class LatinIME extends InputMethodService
} }
if (!mTutorialShownBefore && mTutorial != null) { if (!mTutorialShownBefore && mTutorial != null) {
mTutorial.close(false); mTutorial.close(false);
mTutorial = null;
} }
super.onConfigurationChanged(conf); super.onConfigurationChanged(conf);
} }
@ -299,11 +300,22 @@ public class LatinIME extends InputMethodService
if (mSuggest != null) { if (mSuggest != null) {
mSuggest.setCorrectionMode(mCorrectionMode); mSuggest.setCorrectionMode(mCorrectionMode);
} }
mPredictionOn = mPredictionOn && mCorrectionMode > 0;
if (!mTutorialShownBefore && mTutorial == null) { if (!mTutorialShownBefore && mTutorial == null) {
mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL,
mInputView.isShown() ? 100 : 3000);
}
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); mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000);
} }
mPredictionOn = mPredictionOn && mCorrectionMode > 0;
if (TRACE) Debug.startMethodTracing("latinime");
} }
@Override @Override
@ -313,9 +325,10 @@ public class LatinIME extends InputMethodService
if (mInputView != null) { if (mInputView != null) {
mInputView.closing(); mInputView.closing();
} }
if (!mTutorialShownBefore && mTutorial != null) { // if (!mTutorialShownBefore && mTutorial != null) {
mTutorial.close(false); // mTutorial.close(false);
} // mTutorial = null;
// }
} }
@Override @Override
@ -346,6 +359,10 @@ public class LatinIME extends InputMethodService
@Override @Override
public void hideWindow() { public void hideWindow() {
if (TRACE) Debug.stopMethodTracing(); if (TRACE) Debug.stopMethodTracing();
if (!mTutorialShownBefore && mTutorial != null) {
mTutorial.close(false);
mTutorial = null;
}
super.hideWindow(); super.hideWindow();
TextEntryState.endSession(); TextEntryState.endSession();
} }

32
src/com/android/inputmethod/latin/Tutorial.java
View File

@ -168,22 +168,22 @@ public class Tutorial {
R.string.tip_dismiss, R.string.tip_dismiss,
false, true); false, true);
mBubbles.add(b0); mBubbles.add(b0);
Bubble b1 = new Bubble(context, inputView, // Bubble b1 = new Bubble(context, inputView,
R.drawable.dialog_bubble_step03, // R.drawable.dialog_bubble_step03,
(int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, // (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5,
(int) (inputWidth * 0.45), // (int) (inputWidth * 0.45),
Gravity.TOP | Gravity.RIGHT, // Gravity.TOP | Gravity.RIGHT,
R.string.tip_long_press, // R.string.tip_long_press,
true, false); // true, false);
mBubbles.add(b1); // mBubbles.add(b1);
Bubble b2 = new Bubble(inputView.getContext(), inputView, // Bubble b2 = new Bubble(inputView.getContext(), inputView,
R.drawable.dialog_bubble_step04, // R.drawable.dialog_bubble_step04,
inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5, // inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5,
(int) (inputWidth * 0.45), // (int) (inputWidth * 0.45),
Gravity.BOTTOM | Gravity.LEFT, // Gravity.BOTTOM | Gravity.LEFT,
R.string.tip_access_symbols, // R.string.tip_access_symbols,
true, false); // true, false);
mBubbles.add(b2); // mBubbles.add(b2);
mInputView = inputView; mInputView = inputView;
} }