From 4f3d5d3733c070c0c16315b156068ae5c2aace6a Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 24 Jun 2011 20:17:38 +0900 Subject: [PATCH 1/3] Add a link from Latin IME to the dictionary pack. The link only shows up if the dictionary pack is installed. Bug: 1752028 Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d --- java/res/values/strings.xml | 3 +++ java/res/xml/prefs.xml | 8 ++++++++ java/src/com/android/inputmethod/latin/Settings.java | 11 +++++++++++ 3 files changed, 22 insertions(+) diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 5d7a1f9c7..41d54d549 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -66,6 +66,9 @@ Auto-capitalization + + Configure dictionaries + Quick fixes diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 5f4a27d91..f68ee0168 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -68,6 +68,14 @@ + + + = number) { + textCorrectionGroup.removePreference(dictionaryLink); + } } @Override From 07a62cf3d62adea51c2de861d7989e173a104441 Mon Sep 17 00:00:00 2001 From: satok Date: Fri, 24 Jun 2011 20:30:31 +0900 Subject: [PATCH 2/3] Added very aggressive Bug: 4905916 Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e --- java/res/values/config.xml | 4 +++- java/res/values/donottranslate.xml | 3 +++ java/res/values/strings.xml | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/res/values/config.xml b/java/res/values/config.xml index ad580cc69..40cca9543 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -76,7 +76,9 @@ 0.22 - + 0.08 + 0 diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 1c198d9cb..21e6c55c6 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -86,15 +86,18 @@ 0 1 2 + 3 @string/auto_correction_threshold_mode_index_off @string/auto_correction_threshold_mode_index_modest @string/auto_correction_threshold_mode_index_aggeressive + @string/auto_correction_threshold_mode_index_very_aggeressive @string/auto_correction_threshold_mode_off @string/auto_correction_threshold_mode_modest @string/auto_correction_threshold_mode_aggeressive + @string/auto_correction_threshold_mode_very_aggeressive 0 diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 41d54d549..f6e130789 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -104,6 +104,8 @@ Modest Aggressive + + Very Aggressive Bigram suggestions From 14daf66fc553a8316b7839b546976e7b59e77bdf Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 24 Jun 2011 20:26:41 +0900 Subject: [PATCH 3/3] Remove spacebar preview and arrows Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d --- java/res/drawable/transparent.xml | 30 +++++++++++++++++++ java/res/values/keyboard-icons-ics.xml | 6 ++-- .../inputmethod/keyboard/KeyboardView.java | 7 +++++ .../internal/SlidingLocaleDrawable.java | 16 +++++----- 4 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 java/res/drawable/transparent.xml diff --git a/java/res/drawable/transparent.xml b/java/res/drawable/transparent.xml new file mode 100644 index 000000000..855cf2ad5 --- /dev/null +++ b/java/res/drawable/transparent.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml index 3029695e6..1dfbdf96e 100644 --- a/java/res/values/keyboard-icons-ics.xml +++ b/java/res/values/keyboard-icons-ics.xml @@ -60,7 +60,7 @@ @drawable/sym_keyboard_num0 @drawable/sym_keyboard_shift_locked - @drawable/sym_keyboard_space_holo + @drawable/transparent @drawable/sym_keyboard_feedback_tab @@ -72,7 +72,7 @@ @drawable/sym_keyboard_voice_off_holo @drawable/sym_keyboard_language_arrows_left @drawable/sym_keyboard_language_arrows_right - @drawable/sym_keyboard_feedback_language_arrows_left - @drawable/sym_keyboard_feedback_language_arrows_right + + diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 8d4bfd7a7..9dc019c61 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -130,6 +130,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // Key preview private boolean mInForeground; private TextView mPreviewText; + private Drawable mPreviewBackground; private float mPreviewTextRatio; private int mPreviewTextSize; private boolean mShowKeyPreviewPopup = true; @@ -357,6 +358,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { if (previewLayout != 0) { mPreviewText = (TextView) LayoutInflater.from(context).inflate(previewLayout, null); + mPreviewBackground = mPreviewText.getBackground(); mPreviewTextRatio = getRatio(res, R.fraction.key_preview_text_ratio); } else { mShowKeyPreviewPopup = false; @@ -982,6 +984,11 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { previewIcon != null ? previewIcon : key.getIcon()); previewText.setText(null); } + if (key.mCode == Keyboard.CODE_SPACE) { + previewText.setBackgroundColor(Color.TRANSPARENT); + } else { + previewText.setBackgroundDrawable(mPreviewBackground); + } // Set the preview background state previewText.getBackground().setState( key.mPopupCharacters != null ? LONG_PRESSABLE_STATE_SET : EMPTY_STATE_SET); diff --git a/java/src/com/android/inputmethod/keyboard/internal/SlidingLocaleDrawable.java b/java/src/com/android/inputmethod/keyboard/internal/SlidingLocaleDrawable.java index df4b575f1..f8c81adfb 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/SlidingLocaleDrawable.java +++ b/java/src/com/android/inputmethod/keyboard/internal/SlidingLocaleDrawable.java @@ -58,7 +58,7 @@ public class SlidingLocaleDrawable extends Drawable { public SlidingLocaleDrawable(Context context, Drawable background, int width, int height) { mBackground = background; - Keyboard.setDefaultBounds(mBackground); + Keyboard.setDefaultBounds(background); mWidth = width; mHeight = height; final TextPaint textPaint = new TextPaint(); @@ -68,7 +68,7 @@ public class SlidingLocaleDrawable extends Drawable { textPaint.setTextAlign(Align.CENTER); textPaint.setAntiAlias(true); mTextPaint = textPaint; - mMiddleX = (mWidth - mBackground.getIntrinsicWidth()) / 2; + mMiddleX = (background != null) ? (mWidth - mBackground.getIntrinsicWidth()) / 2 : 0; final TypedArray a = context.obtainStyledAttributes( null, R.styleable.LatinKeyboard, R.attr.latinKeyboardStyle, R.style.LatinKeyboard); @@ -119,11 +119,13 @@ public class SlidingLocaleDrawable extends Drawable { canvas.drawText(mNextLanguage, diff - width / 2, baseline, paint); canvas.drawText(mPrevLanguage, diff + width + width / 2, baseline, paint); - Keyboard.setDefaultBounds(lArrow); - rArrow.setBounds(width - rArrow.getIntrinsicWidth(), 0, width, - rArrow.getIntrinsicHeight()); - lArrow.draw(canvas); - rArrow.draw(canvas); + if (lArrow != null && rArrow != null) { + Keyboard.setDefaultBounds(lArrow); + rArrow.setBounds(width - rArrow.getIntrinsicWidth(), 0, width, + rArrow.getIntrinsicHeight()); + lArrow.draw(canvas); + rArrow.draw(canvas); + } } if (mBackground != null) { canvas.translate(mMiddleX, 0);