diff options
Diffstat (limited to 'java/src')
3 files changed, 10 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index ab2a12fd0..d369e2b47 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -91,7 +91,7 @@ public final class BinaryDictionary extends Dictionary { private static native long openNative(String sourceDir, long dictOffset, long dictSize); private static native void closeNative(long dict); - private static native int getFrequencyNative(long dict, int[] word); + private static native int getProbabilityNative(long dict, int[] word); private static native boolean isValidBigramNative(long dict, int[] word1, int[] word2); private static native int getSuggestionsNative(long dict, long proximityInfo, long traverseSession, int[] xCoordinates, int[] yCoordinates, int[] times, @@ -186,7 +186,7 @@ public final class BinaryDictionary extends Dictionary { public int getFrequency(final String word) { if (word == null) return -1; int[] codePoints = StringUtils.toCodePointArray(word); - return getFrequencyNative(mNativeDict, codePoints); + return getProbabilityNative(mNativeDict, codePoints); } // TODO: Add a batch process version (isValidBigramMultiple?) to avoid excessive numbers of jni diff --git a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java index 2a501a665..e1b5a802e 100644 --- a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java +++ b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java @@ -21,15 +21,18 @@ import android.os.Bundle; import android.preference.PreferenceActivity; public final class DebugSettingsActivity extends PreferenceActivity { + private static final String DEFAULT_FRAGMENT = DebugSettings.class.getName(); + @Override public Intent getIntent() { - final Intent modIntent = new Intent(super.getIntent()); - modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DebugSettings.class.getName()); - return modIntent; + final Intent intent = super.getIntent(); + intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT); + intent.putExtra(EXTRA_NO_HEADERS, true); + return intent; } @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setTitle(R.string.english_ime_debug_settings); } diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java index ed8cf6d8f..99b572e06 100644 --- a/java/src/com/android/inputmethod/latin/SettingsActivity.java +++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java @@ -25,9 +25,7 @@ public final class SettingsActivity extends PreferenceActivity { @Override public Intent getIntent() { final Intent intent = super.getIntent(); - if (!intent.hasExtra(EXTRA_SHOW_FRAGMENT)) { - intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT); - } + intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT); intent.putExtra(EXTRA_NO_HEADERS, true); return intent; } |