PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the word commit code to UserDictionaryAddWordContent.

Browse Source 
...and call it from the fragment too.

Bug: 6026080
Change-Id: Icb83fd60ed33dfa593124ed0af6b9fff4b63f1f5
This commit is contained in:
Jean Chalard
2012-05-08 19:45:24 +09:00
parent be3f0faf52
commit fbffd0c982
3 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
View File

@@ -16,11 +16,17 @@
package com.android.settings.inputmethod;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Bundle;
import android.provider.UserDictionary;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import com.android.settings.R;
import com.android.settings.UserDictionarySettings;
import com.android.settings.Utils;
import java.util.Locale;
@@ -36,9 +42,12 @@ public class UserDictionaryAddWordContents {
public static final int MODE_EDIT = 0;
public static final int MODE_INSERT = 1;
private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
/* package */ final int mMode; // Either MODE_EDIT or MODE_INSERT
/* package */ final EditText mEditText;
/* package */ String mLocale;
/* package */ String mOldWord;
/* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
mEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
@@ -48,6 +57,7 @@ public class UserDictionaryAddWordContents {
mEditText.setSelection(word.length());
}
mMode = args.getInt(EXTRA_MODE); // default return value for #getInt() is 0 = MODE_EDIT
mOldWord = args.getString(EXTRA_WORD);
updateLocale(args.getString(EXTRA_LOCALE));
}
@@ -56,4 +66,25 @@ public class UserDictionaryAddWordContents {
/* package */ void updateLocale(final String locale) {
mLocale = null == locale ? Locale.getDefault().toString() : locale;
}
/* package */ void apply(final Context context) {
final ContentResolver resolver = context.getContentResolver();
if (UserDictionaryAddWordContents.MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
UserDictionarySettings.deleteWord(mOldWord, resolver);
}
final String newWord = mEditText.getText().toString();
if (TextUtils.isEmpty(newWord)) {
// If the word is somehow empty, don't insert it.
return;
}
// Disallow duplicates.
// TODO: Redefine the logic when we support shortcuts.
UserDictionarySettings.deleteWord(newWord, resolver);
// In this class we use the empty string to represent 'all locales' and mLocale cannot
// be null. However the addWord method takes null to mean 'all locales'.
UserDictionary.Words.addWord(context, newWord.toString(),
FREQUENCY_FOR_USER_DICTIONARY_ADDS, null /* shortcut */,
TextUtils.isEmpty(mLocale) ? null : Utils.createLocaleFromString(mLocale));
}
}