Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4621365b authored by Dan Zivkovic's avatar Dan Zivkovic Committed by Android (Google) Code Review
Browse files

Merge "Delete user history files."

parents 74fa8510 bdd6c995

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

+1 −1
Original line number Diff line number Diff line
@@ -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";

java/src/com/android/inputmethod/latin/DictionaryFacilitator.java

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public interface DictionaryFacilitator { 


    int getMaxFrequencyOfExactMatches(final String word);



    void clearUserHistoryDictionary();

    void clearUserHistoryDictionary(final Context context);



    String dump(final Context context);

java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { 
    }



    @Override

    public void clearUserHistoryDictionary() {

    public void clearUserHistoryDictionary(final Context context) {

        clearSubDictionary(Dictionary.TYPE_USER_HISTORY);

    }

java/src/com/android/inputmethod/latin/LatinIME.java

+2 −3
Original line number Diff line number Diff line
@@ -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