From e04484851a230d356af177129a4e7aa667177e6d Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 19 Mar 2009 23:08:57 -0700 Subject: [PATCH] auto import from //branches/cupcake_rel/...@141571 --- res/drawable/dialog_bubble_step02.9.png | Bin 1036 -> 100 bytes res/layout/bubble_text.xml | 1 + res/values-cs/donottranslate.xml | 27 +++++++++++++++ res/values/donottranslate.xml | 6 ++++ res/xml/kbd_qwerty.xml | 16 ++++++--- res/xml/prefs.xml | 1 - .../android/inputmethod/latin/LatinIME.java | 31 +++++++++++++---- .../android/inputmethod/latin/Tutorial.java | 32 +++++++++--------- 8 files changed, 86 insertions(+), 28 deletions(-) create mode 100644 res/values-cs/donottranslate.xml diff --git a/res/drawable/dialog_bubble_step02.9.png b/res/drawable/dialog_bubble_step02.9.png index d77f85fe28e807d099c5bef39e8eb50c8aed60bb..62386f2975631501e6836d8c16484a3341895d44 100755 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^>_9BV!3HF&rQD_gDQ!;|$B>F!$q5du|0ORpF6w$z zUt%Mn`k#Nwlm7>wEf7@jbTM-Dy6}IZuo=TK{=LremnP`~wJ~_Q`njxgN@xNA1Z5tt literal 1036 zcmV+n1oQieP)w3|#000BiNkl2Z|b2sHNiA*(cRs(xqR*)_ZF~wFKz4M>4#%~)=Fn*%^sSX zQ0lp26mS7;nV9Hypy-RInpL#fgn(Y?3Ep<>LA{L15SVNO5H~+RFouGL?jx++xmyU0 zJq5Hj21lWXnR2t?OzjCoaA}_xEEJG-g5Q)?)QW*k&ZcRWEFTV98T_}Lsrp#l${1+EnqEbxE{UGlNM#1+RKmZH4uoW#91y^ zT`jEWdA&yisCBs<_#&J|o;&=#2FhNDY31(3X+d#u@$nPG!_CgAsopWI&9N3WsHFg@ zIhNGG4g6?{`>}VCO~UuUgBN=0000 diff --git a/res/values-cs/donottranslate.xml b/res/values-cs/donottranslate.xml new file mode 100644 index 000000000..41431388a --- /dev/null +++ b/res/values-cs/donottranslate.xml @@ -0,0 +1,27 @@ + + + + + ď + + ř + + ť + diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml index 8a879bdd5..e766dba77 100644 --- a/res/values/donottranslate.xml +++ b/res/values/donottranslate.xml @@ -22,4 +22,10 @@ .\u0020,;:!?\n()[]*&@{}/<>_+=|\u0022 .,;:!? + + + + + + diff --git a/res/xml/kbd_qwerty.xml b/res/xml/kbd_qwerty.xml index 34e991239..979471059 100755 --- a/res/xml/kbd_qwerty.xml +++ b/res/xml/kbd_qwerty.xml @@ -32,8 +32,12 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> - - + + - + @@ -76,7 +82,9 @@ android:keyWidth="15%p" android:isModifier="true" android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> - + diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index bde04d15a..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,13 +300,24 @@ public class LatinIME extends InputMethodService if (mSuggest != null) { mSuggest.setCorrectionMode(mCorrectionMode); } - if (!mTutorialShownBefore && mTutorial == null) { - mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000); - } mPredictionOn = mPredictionOn && mCorrectionMode > 0; + 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); + } + } + @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(); } @@ -982,7 +999,7 @@ public class LatinIME extends InputMethodService // Get the settings preferences SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); mProximityCorrection = sp.getBoolean(PREF_PROXIMITY_CORRECTION, true); - mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, true); + mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, false); mSoundOn = sp.getBoolean(PREF_SOUND_ON, false); String predictionBasic = getString(R.string.prediction_basic); String mode = sp.getString(PREF_PREDICTION, predictionBasic); 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; }