Projects >> packages_input_LatinIME >>585d7e123874d4bce81dd93077763537a888c0fd

Chunk
Conflicting content
        stop();
    }

<<<<<<< HEAD
    private static final String[] EVENTKEYS_PREFS_CHANGED = {
        "PrefsChanged", "prefs"
=======
    private static final String[] EVENTKEYS_LATINIME_COMMITTEXT = {
        "LatinIMECommitText", "typedWord"
    };

    public static void latinIME_commitText(final CharSequence typedWord) {
        final String scrubbedWord = scrubDigitsFromString(typedWord.toString());
        final Object[] values = {
            scrubbedWord
        };
        final ResearchLogger researchLogger = getInstance();
        researchLogger.enqueuePotentiallyPrivateEvent(EVENTKEYS_LATINIME_COMMITTEXT, values);
        researchLogger.onWordComplete(scrubbedWord);
    }

    private static final String[] EVENTKEYS_USER_FEEDBACK = {
        "UserFeedback", "FeedbackContents"
>>>>>>> 7fe4eeb800df5a55f0a17cc21c7cf7c5c2ae09b0
    };
    public static void prefsChanged(final SharedPreferences prefs) {
        final ResearchLogger researchLogger = getInstance();
Solution content
        stop();
    }

    private static final String[] EVENTKEYS_PREFS_CHANGED = {
        "PrefsChanged", "prefs"
    };
    public static void prefsChanged(final SharedPreferences prefs) {
        final ResearchLogger researchLogger = getInstance();
File
ResearchLogger.java
Developer's decision
Version 1
Kind of conflict
Array initializer
Attribute
Method declaration