Merge "Rename PopupCharactersParser to MoreKeySpecParser"
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 548da1b..703258b 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -9,6 +9,7 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<application android:label="@string/english_ime_name"
+ android:icon="@drawable/ic_ime_settings"
android:backupAgent="BackupAgent"
android:killAfterRestore="false">
diff --git a/java/res/drawable-hdpi/ic_ime_settings.png b/java/res/drawable-hdpi/ic_ime_settings.png
new file mode 100644
index 0000000..f8f8073
--- /dev/null
+++ b/java/res/drawable-hdpi/ic_ime_settings.png
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_ime_settings.png b/java/res/drawable-mdpi/ic_ime_settings.png
new file mode 100644
index 0000000..060e862
--- /dev/null
+++ b/java/res/drawable-mdpi/ic_ime_settings.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_ime_settings.png b/java/res/drawable-xhdpi/ic_ime_settings.png
new file mode 100644
index 0000000..d674be0
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_ime_settings.png
Binary files differ
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 6d2218d..2f32181 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -91,23 +91,6 @@
android:defaultValue="@string/prefs_suggestion_visibility_default_value" />
</PreferenceCategory>
<PreferenceCategory
- android:title="@string/ngram_category"
- android:key="ngram_settings">
- <CheckBoxPreference
- android:key="bigram_suggestion"
- android:title="@string/bigram_suggestion"
- android:summary="@string/bigram_suggestion_summary"
- android:persistent="true"
- android:defaultValue="true" />
- <CheckBoxPreference
- android:key="bigram_prediction"
- android:dependency="bigram_suggestion"
- android:title="@string/bigram_prediction"
- android:summary="@string/bigram_prediction_summary"
- android:persistent="true"
- android:defaultValue="false" />
- </PreferenceCategory>
- <PreferenceCategory
android:title="@string/misc_category"
android:key="misc_settings">
<CheckBoxPreference
@@ -143,6 +126,20 @@
android:summary="@string/use_contacts_dict_summary"
android:persistent="true"
android:defaultValue="true" />
+ <CheckBoxPreference
+ android:key="bigram_suggestion"
+ android:title="@string/bigram_suggestion"
+ android:summary="@string/bigram_suggestion_summary"
+ android:persistent="true"
+ android:defaultValue="true" />
+ <!-- TODO: evaluate results and revive this option. The code already supports it. -->
+ <!-- <CheckBoxPreference -->
+ <!-- android:key="bigram_prediction" -->
+ <!-- android:dependency="bigram_suggestion" -->
+ <!-- android:title="@string/bigram_prediction" -->
+ <!-- android:summary="@string/bigram_prediction_summary" -->
+ <!-- android:persistent="true" -->
+ <!-- android:defaultValue="false" /> -->
</PreferenceScreen>
<!-- <Preference
android:title="Debug Settings"
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java
index db7cc51..520466c 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.res.Resources;
-import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
@@ -38,7 +37,6 @@
private final int[] mCoordinates = new int[2];
private final KeyDetector mKeyDetector;
- private final int mVerticalCorrection;
private Controller mController;
private KeyboardActionListener mListener;
@@ -135,12 +133,6 @@
public MiniKeyboardView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
- final TypedArray a = context.obtainStyledAttributes(
- attrs, R.styleable.KeyboardView, defStyle, R.style.KeyboardView);
- mVerticalCorrection = a.getDimensionPixelOffset(
- R.styleable.KeyboardView_verticalCorrection, 0);
- a.recycle();
-
final Resources res = context.getResources();
// Override default ProximityKeyDetector.
mKeyDetector = new MiniKeyboardKeyDetector(res.getDimension(
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index a5eed90..b79c441 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -73,7 +73,6 @@
public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold";
public static final String PREF_DEBUG_SETTINGS = "debug_settings";
- public static final String PREF_NGRAM_SETTINGS_KEY = "ngram_settings";
public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
public static final String PREF_BIGRAM_PREDICTIONS = "bigram_prediction";
