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

Commit f7058c2a authored by Jatin Matani's avatar Jatin Matani Committed by Android (Google) Code Review
Browse files

Merge "Pass long timestamps to DictionaryFacilitator"

parents edb2d238 94b85235

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

+2 −2
Original line number Diff line number Diff line
@@ -147,11 +147,11 @@ public interface DictionaryFacilitator { 
            throws InterruptedException;



    void addToUserHistory(final String suggestion, final boolean wasAutoCapitalized,

            @Nonnull final NgramContext ngramContext, final int timeStampInSeconds,

            @Nonnull final NgramContext ngramContext, final long timeStampInSeconds,

            final boolean blockPotentiallyOffensive);



    void unlearnFromUserHistory(final String word,

            @Nonnull final NgramContext ngramContext, final int timeStampInSeconds,

            @Nonnull final NgramContext ngramContext, final long timeStampInSeconds,

            final int eventType);



    // TODO: Revise the way to fusion suggestion results.

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

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



    public void addToUserHistory(final String suggestion, final boolean wasAutoCapitalized,

            @Nonnull final NgramContext ngramContext, final int timeStampInSeconds,

            @Nonnull final NgramContext ngramContext, final long timeStampInSeconds,

            final boolean blockPotentiallyOffensive) {

        final DictionaryGroup dictionaryGroup = getDictionaryGroupForMostProbableLanguage();

        final String[] words = suggestion.split(Constants.WORD_SEPARATOR);
@@ -588,7 +588,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { 
            final String currentWord = words[i];

            final boolean wasCurrentWordAutoCapitalized = (i == 0) ? wasAutoCapitalized : false;

            addWordToUserHistory(dictionaryGroup, ngramContextForCurrentWord, currentWord,

                    wasCurrentWordAutoCapitalized, timeStampInSeconds, blockPotentiallyOffensive);

                    wasCurrentWordAutoCapitalized, (int) timeStampInSeconds, blockPotentiallyOffensive);

            ngramContextForCurrentWord =

                    ngramContextForCurrentWord.getNextNgramContext(new WordInfo(currentWord));

        }
@@ -656,7 +656,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { 


    @Override

    public void unlearnFromUserHistory(final String word,

            @Nonnull final NgramContext ngramContext, final int timeStampInSeconds,

            @Nonnull final NgramContext ngramContext, final long timeStampInSeconds,

            final int eventType) {

        // TODO: Decide whether or not to remove the word on EVENT_BACKSPACE.

        if (eventType != Constants.EVENT_BACKSPACE) {

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

+1 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ public final class InputLogic { 
    void unlearnWord(final String word, final SettingsValues settingsValues, final int eventType) {

        final NgramContext ngramContext = mConnection.getNgramContextFromNthPreviousWord(

            settingsValues.mSpacingAndPunctuations, 2);

        final int timeStampInSeconds = (int)TimeUnit.MILLISECONDS.toSeconds(

        final long timeStampInSeconds = TimeUnit.MILLISECONDS.toSeconds(

            System.currentTimeMillis());

        mDictionaryFacilitator.unlearnFromUserHistory(

            word, ngramContext, timeStampInSeconds, eventType);