nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4621365b: Merge "Delete user history files." 

* commit '4621365b216559c3dd3d0e22ec05cdaba78acc3d':
  Delete user history files.
main
Dan Zivkovic 2015-03-11 19:01:25 +00:00 committed by Android Git Automerger
parent 5edb5f4308 4621365b21
commit 14125949c6
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
View File

@ -63,7 +63,7 @@ import javax.annotation.Nullable;
*/
public final class KeyboardLayoutSet {
private static final String TAG = KeyboardLayoutSet.class.getSimpleName();
private static final boolean DEBUG_CACHE = DebugFlags.DEBUG_ENABLED;
private static final boolean DEBUG_CACHE = false;
private static final String TAG_KEYBOARD_SET = "KeyboardLayoutSet";
private static final String TAG_ELEMENT = "Element";

6
java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
View File

@ -169,10 +169,10 @@ public interface DictionaryFacilitator {
int getMaxFrequencyOfExactMatches(final String word);
void clearUserHistoryDictionary();
void clearUserHistoryDictionary(final Context context);
String dump(final Context context);
void dumpDictionaryForDebug(final String dictName);
ArrayList<Pair<String, DictionaryStats>> getStatsOfEnabledSubDicts();

2
java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
View File

@ -776,7 +776,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
}
@Override
public void clearUserHistoryDictionary() {
public void clearUserHistoryDictionary(final Context context) {
clearSubDictionary(Dictionary.TYPE_USER_HISTORY);
}

5
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -609,7 +609,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void refreshPersonalizationDictionarySession(
final SettingsValues currentSettingsValues) {
// TODO: Remove all existing personalized dictionaries.
mDictionaryFacilitator.setIsMonolingualUser(
mRichImm.isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes());
final boolean shouldKeepUserHistoryDictionaries;
@ -621,7 +620,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (!shouldKeepUserHistoryDictionaries) {
// Remove user history dictionaries.
PersonalizationHelper.removeAllUserHistoryDictionaries(this);
mDictionaryFacilitator.clearUserHistoryDictionary();
mDictionaryFacilitator.clearUserHistoryDictionary(this);
}
}
@ -1802,7 +1801,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// DO NOT USE THIS for any other purpose than testing.
@UsedForTesting
/* package for test */ void clearPersonalizedDictionariesForTest() {
mDictionaryFacilitator.clearUserHistoryDictionary();
mDictionaryFacilitator.clearUserHistoryDictionary(this);
}
@UsedForTesting