aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/drawable/transparent.xml30
-rw-r--r--java/res/values/config.xml4
-rw-r--r--java/res/values/donottranslate.xml3
-rw-r--r--java/res/values/keyboard-icons-ics.xml6
-rw-r--r--java/res/values/strings.xml5
-rw-r--r--java/res/xml/prefs.xml8
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java7
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/SlidingLocaleDrawable.java16
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java11
9 files changed, 79 insertions, 11 deletions
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle"
+>
+ <solid
+ android:color="@android:color/transparent" />
+ <size
+ android:width="50dp"
+ android:height="40dp" />
+</shape>
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 @@
<!-- Modest : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
<item>0.22</item>
- <!-- Aggressive : Suggestion whose normalized score is greater than this value
+ <!-- Aggressive -->
+ <item>0.08</item>
+ <!-- Very Aggressive : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
<item>0</item>
</string-array>
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 @@
<string name="auto_correction_threshold_mode_index_off">0</string>
<string name="auto_correction_threshold_mode_index_modest">1</string>
<string name="auto_correction_threshold_mode_index_aggeressive">2</string>
+ <string name="auto_correction_threshold_mode_index_very_aggeressive">3</string>
<string-array name="auto_correction_threshold_mode_indexes">
<item>@string/auto_correction_threshold_mode_index_off</item>
<item>@string/auto_correction_threshold_mode_index_modest</item>
<item>@string/auto_correction_threshold_mode_index_aggeressive</item>
+ <item>@string/auto_correction_threshold_mode_index_very_aggeressive</item>
</string-array>
<string-array name="auto_correction_threshold_modes">
<item>@string/auto_correction_threshold_mode_off</item>
<item>@string/auto_correction_threshold_mode_modest</item>
<item>@string/auto_correction_threshold_mode_aggeressive</item>
+ <item>@string/auto_correction_threshold_mode_very_aggeressive</item>
</string-array>
<string name="voice_mode_main">0</string>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 9507d74da..750cd3504 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -60,7 +60,7 @@
<item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
<!-- <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item> -->
<item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
- <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_space_holo</item>
+ <item name="iconPreviewSpaceKey">@drawable/transparent</item>
<!-- <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item> -->
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
<!-- <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
@@ -72,7 +72,7 @@
<item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
<item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
<item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
- <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item>
- <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item>
+<!-- <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item> -->
+<!-- <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item> -->
</style>
</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 75f4c50fb..cd11ee6f6 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -66,6 +66,9 @@
<!-- Option to enable auto capitalization of sentences -->
<string name="auto_cap">Auto-capitalization</string>
+ <!-- Option to configure dictionaries -->
+ <string name="configure_dictionaries_title">Configure dictionaries</string>
+
<!-- Option to enable quick fixes -->
<string name="quick_fixes">Quick fixes</string>
<!-- Description for quick fixes -->
@@ -101,6 +104,8 @@
<string name="auto_correction_threshold_mode_modest">Modest</string>
<!-- Option to suggest auto correction candidates aggressively. Auto-corrects to a word which has even large edit distance from typed word. [CHAR LIMIT=20] -->
<string name="auto_correction_threshold_mode_aggeressive">Aggressive</string>
+ <!-- Option to suggest auto correction candidates very aggressively. Auto-corrects to a word which has even large edit distance from typed word. [CHAR LIMIT=20] -->
+ <string name="auto_correction_threshold_mode_very_aggeressive">Very Aggressive</string>
<!-- Option to enable bigram correction -->
<string name="bigram_suggestion">Bigram suggestions</string>
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 @@
<PreferenceCategory
android:title="@string/correction_category"
android:key="correction_settings">
+ <PreferenceScreen
+ android:key="configure_dictionaries_key"
+ android:title="@string/configure_dictionaries_title">
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="com.google.android.inputmethod.latin.dictionarypack"
+ android:targetClass="com.google.android.inputmethod.latin.dictionarypack.DictionarySettings" />
+ </PreferenceScreen>
<CheckBoxPreference
android:key="quick_fixes"
android:title="@string/quick_fixes"
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);
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 3ad2a5965..6c515c845 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -25,6 +25,7 @@ import com.android.inputmethod.compat.VibratorCompatWrapper;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.backup.BackupManager;
+import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -65,6 +66,7 @@ public class Settings extends PreferenceActivity
public static final String PREF_SELECTED_LANGUAGES = "selected_languages";
public static final String PREF_SUBTYPES = "subtype_settings";
+ public static final String PREF_CONFIGURE_DICTIONARIES_KEY = "configure_dictionaries_key";
public static final String PREF_CORRECTION_SETTINGS_KEY = "correction_settings";
public static final String PREF_QUICK_FIXES = "quick_fixes";
public static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting";
@@ -424,6 +426,15 @@ public class Settings extends PreferenceActivity
}
mKeyPreviewPopupDismissDelay.setEnabled(
Settings.Values.isKeyPreviewPopupEnabled(prefs, res));
+
+ final PreferenceScreen dictionaryLink =
+ (PreferenceScreen) findPreference(PREF_CONFIGURE_DICTIONARIES_KEY);
+ final Intent intent = dictionaryLink.getIntent();
+
+ final int number = getPackageManager().queryIntentActivities(intent, 0).size();
+ if (0 >= number) {
+ textCorrectionGroup.removePreference(dictionaryLink);
+ }
}
@Override
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-01 23:42:53 +0000