Projects >> packages_input_LatinIME >>c95efbbd575239b97db20b71fb347b543b5808f8

Chunk
Conflicting content 
        // U+20AC: "€" EURO SIGN
        // U+00A5: "¥" YEN SIGN
        // U+20B1: "₱" PESO SIGN
<<<<<<< HEAD
        /* 50 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
        /* 51 */ "$",
        /* 52 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
        /* 53 */ "!fixedColumnOrder!8,;,/,(,),#,!,\\,,?,&,\\%,+,\",-,:,',@",
=======
        /* 56 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
        /* 57 */ "$",
        /* 58 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
        /* 59 */ "!fixedColumnOrder!8,;,/,(,),#,!,\\,,?,&,\\%,+,\",-,:,',@",
        /* 60 */ "!fixedColumnOrder!7,;,/,(,),#,',\\,,&,\\%,+,\",-,:,@",
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        // U+2020: "†" DAGGER
        // U+2021: "‡" DOUBLE DAGGER
        // U+2605: "★" BLACK STAR
Solution content 
        // U+20AC: "€" EURO SIGN
        // U+00A5: "¥" YEN SIGN
        // U+20B1: "₱" PESO SIGN
        /* 50 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
        /* 51 */ "$",
        /* 52 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
        /* 53 */ "!fixedColumnOrder!8,;,/,(,),#,!,\\,,?,&,\\%,+,\",-,:,',@",
        // U+2020: "†" DAGGER
        // U+2021: "‡" DOUBLE DAGGER
        // U+2605: "★" BLACK STAR
File
KeyboardTextsSet.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~58 */
        // U+00B7: "·" MIDDLE DOT
<<<<<<< HEAD
        /* 53 */ "!fixedColumnOrder!9,;,/,(,),#,\u00B7,!,\\,,?,&,\\%,+,\",-,:,',@",
        /* 54~ */
=======
        /* 59 */ "!fixedColumnOrder!9,;,/,(,),#,\u00B7,!,\\,,?,&,\\%,+,\",-,:,',@",
        /* 60 */ "!fixedColumnOrder!8,;,/,(,),#,\u00B7,',\\,,&,\\%,+,\",-,:,@",
        /* 61~ */
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
Solution content 
        // U+00B7: "·" MIDDLE DOT
        /* 53 */ "!fixedColumnOrder!9,;,/,(,),#,\u00B7,!,\\,,?,&,\\%,+,\",-,:,',@",
        /* 54~ */
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
File
KeyboardTextsSet.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        /* 55 */ "!text/double_laqm_raqm_rtl",
        /* 56 */ null,
        // U+20AA: "₪" NEW SHEQEL SIGN
<<<<<<< HEAD
        /* 51 */ "\u20AA",
        /* 52 */ null,
        /* 53 */ "!fixedColumnOrder!8,;,/,(|),)|(,#,!,\\,,?,&,\\%,+,\",-,:,',@",
=======
        /* 57 */ "\u20AA",
        /* 58 */ null,
        /* 59 */ "!fixedColumnOrder!8,;,/,(|),)|(,#,!,\\,,?,&,\\%,+,\",-,:,',@",
        /* 60 */ "!fixedColumnOrder!7,;,/,(|),)|(,#,',\\,,&,\\%,+,\",-,:,@",
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        // U+2605: "★" BLACK STAR
        /* 61 */ "\u2605",
        /* 62 */ null,
Solution content 
        // U+20AA: "₪" NEW SHEQEL SIGN
        /* 51 */ "\u20AA",
        /* 52 */ null,
        /* 53 */ "!fixedColumnOrder!8,;,/,(|),)|(,#,!,\\,,?,&,\\%,+,\",-,:,',@",
        // U+2605: "★" BLACK STAR
File
KeyboardTextsSet.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
=======
                } else {
                    final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
                    if (codePointBeforeCursor == Constants.NOT_A_CODE) {
<<<<<<< HEAD
                        // Nothing to delete before the cursor. We have to revert the deletion
                        // states that were updated at the beginning of this method.
                        mDeleteCount--;
                        mExpectingUpdateSelection = false;
                        // Nothing to delete before the cursor.
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
                        return;
                    }
                    final int lengthToDelete =
Solution content 
                } else {
                    final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
                    if (codePointBeforeCursor == Constants.NOT_A_CODE) {
                        // Nothing to delete before the cursor. We have to revert the deletion
                        // states that were updated at the beginning of this method.
                        mDeleteCount--;
                        mExpectingUpdateSelection = false;
                        return;
                    }
                    final int lengthToDelete =
File
LatinIME.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
                    final int lengthToDelete =
                            Character.isSupplementaryCodePoint(codePointBeforeCursor) ? 2 : 1;
                    mConnection.deleteSurroundingText(lengthToDelete, 0);
<<<<<<< HEAD
=======
                    if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
                        ResearchLogger.latinIME_handleBackspace(lengthToDelete,
                                true /* shouldUncommitLogUnit */);
                    }
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
                    if (mDeleteCount > DELETE_ACCELERATE_AT) {
                        final int codePointBeforeCursorToDeleteAgain =
                                mConnection.getCodePointBeforeCursor();
Solution content 
                    final int lengthToDelete =
                            Character.isSupplementaryCodePoint(codePointBeforeCursor) ? 2 : 1;
                    mConnection.deleteSurroundingText(lengthToDelete, 0);
                    if (mDeleteCount > DELETE_ACCELERATE_AT) {
                        final int codePointBeforeCursorToDeleteAgain =
                                mConnection.getCodePointBeforeCursor();
File
LatinIME.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                                mConnection.getCodePointBeforeCursor();
                        if (codePointBeforeCursorToDeleteAgain != Constants.NOT_A_CODE) {
                            final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
<<<<<<< HEAD
                                   codePointBeforeCursorToDeleteAgain) ? 2 : 1;
                            mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
=======
                                    codePointBeforeCursorToDeleteAgain) ? 2 : 1;
                            mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
                            if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
                                ResearchLogger.latinIME_handleBackspace(lengthToDeleteAgain,
                                        true /* shouldUncommitLogUnit */);
                            }
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
                        }
                    }
                }
Solution content 
                                mConnection.getCodePointBeforeCursor();
                        if (codePointBeforeCursorToDeleteAgain != Constants.NOT_A_CODE) {
                            final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
                                   codePointBeforeCursorToDeleteAgain) ? 2 : 1;
                            mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
                        }
                    }
                }
File
LatinIME.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    private static final int INVALID_CURSOR_POSITION = -1;

    /**
<<<<<<< HEAD
     * This variable contains an expected value for the cursor position. This is where the
     * cursor may end up after all the keyboard-triggered updates have passed. We keep this to
     * compare it to the actual cursor position to guess whether the move was caused by a
     * keyboard command or not.
     * It's not really the cursor position: the cursor may not be there yet, and it's also expected
     * there be cases where it never actually comes to be there.
=======
     * This variable contains an expected value for the selection start position. This is where the
     * cursor or selection start may end up after all the keyboard-triggered updates have passed. We
     * keep this to compare it to the actual selection start to guess whether the move was caused by
     * a keyboard command or not.
     * It's not really the selection start position: the selection start may not be there yet, and
     * in some cases, it may never arrive there.
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
     */
    private int mExpectedSelStart = INVALID_CURSOR_POSITION; // in chars, not code points
    /**
Solution content 
    private static final int INVALID_CURSOR_POSITION = -1;

    /**
     * This variable contains an expected value for the cursor position. This is where the
     * cursor may end up after all the keyboard-triggered updates have passed. We keep this to
     * compare it to the actual cursor position to guess whether the move was caused by a
     * keyboard command or not.
     * It's not really the cursor position: the cursor may not be there yet, and it's also expected
     * there be cases where it never actually comes to be there.
     */
File
RichInputConnection.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        // However, if we don't have an expected cursor position, then we should always
        // go fetch the cache again (as it happens, INVALID_CURSOR_POSITION < 0, so we need to
        // test for this explicitly)
<<<<<<< HEAD
        if (INVALID_CURSOR_POSITION != mExpectedCursorPosition
                && (cachedLength >= n || cachedLength >= mExpectedCursorPosition)) {
=======
        if (INVALID_CURSOR_POSITION != mExpectedSelStart
                && (cachedLength >= n || cachedLength >= mExpectedSelStart)) {
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
            final StringBuilder s = new StringBuilder(mCommittedTextBeforeComposingText);
            // We call #toString() here to create a temporary object.
            // In some situations, this method is called on a worker thread, and it's possible
Solution content 
        // However, if we don't have an expected cursor position, then we should always
        // go fetch the cache again (as it happens, INVALID_CURSOR_POSITION < 0, so we need to
        // test for this explicitly)
        if (INVALID_CURSOR_POSITION != mExpectedCursorPosition
                && (cachedLength >= n || cachedLength >= mExpectedCursorPosition)) {
            final StringBuilder s = new StringBuilder(mCommittedTextBeforeComposingText);
            // We call #toString() here to create a temporary object.
            // In some situations, this method is called on a worker thread, and it's possible
File
RichInputConnection.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
     */
    static int writeNodes(final OutputStream destination, final PtNodeInfo[] infos)
            throws IOException {
<<<<<<< HEAD
        int size = getPtNodeCountSize(infos.length);
        switch (getPtNodeCountSize(infos.length)) {
            case 1:
                destination.write((byte)infos.length);
                break;
            case 2:
                final int encodedPtNodeCount =
                        infos.length | FormatSpec.LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG;
                destination.write((byte)(encodedPtNodeCount >> 8));
                destination.write((byte)(encodedPtNodeCount & 0xFF));
                break;
            default:
                throw new RuntimeException("Invalid node count size.");
        }
=======
        int size = writePtNodeCount(destination, infos.length);
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        for (final PtNodeInfo info : infos) size += writePtNode(destination, info);
        writeSInt24ToStream(destination, FormatSpec.NO_FORWARD_LINK_ADDRESS);
        return size + FormatSpec.FORWARD_LINK_ADDRESS_SIZE;
Solution content 
     */
    static int writeNodes(final OutputStream destination, final PtNodeInfo[] infos)
            throws IOException {
        int size = getPtNodeCountSize(infos.length);
        switch (getPtNodeCountSize(infos.length)) {
            case 1:
                destination.write((byte)infos.length);
                break;
            case 2:
                final int encodedPtNodeCount =
                        infos.length | FormatSpec.LARGE_PTNODE_ARRAY_SIZE_FIELD_SIZE_FLAG;
                destination.write((byte)(encodedPtNodeCount >> 8));
                destination.write((byte)(encodedPtNodeCount & 0xFF));
                break;
            default:
                throw new RuntimeException("Invalid node count size.");
        }
        for (final PtNodeInfo info : infos) size += writePtNode(destination, info);
        writeSInt24ToStream(destination, FormatSpec.NO_FORWARD_LINK_ADDRESS);
        return size + FormatSpec.FORWARD_LINK_ADDRESS_SIZE;
File
BinaryDictIOUtils.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Switch statement
Variable
Chunk
Conflicting content 
                updateDebugMode();
                mServiceNeedsRestart = true;
            }
<<<<<<< HEAD
        } else if (key.equals(PREF_FORCE_NON_DISTINCT_MULTITOUCH)
                || key.equals(PREF_USE_ONLY_PERSONALIZATION_DICTIONARY_FOR_DEBUG)) {
=======
        } else if (key.equals(PREF_FORCE_NON_DISTINCT_MULTITOUCH)) {
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
            mServiceNeedsRestart = true;
        }
    }
Solution content 
                updateDebugMode();
                mServiceNeedsRestart = true;
            }
        } else if (key.equals(PREF_FORCE_NON_DISTINCT_MULTITOUCH)
                || key.equals(PREF_USE_ONLY_PERSONALIZATION_DICTIONARY_FOR_DEBUG)) {
            mServiceNeedsRestart = true;
        }
    }
File
DebugSettings.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
        if (showSetupWizardIcon != null) {
            showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
        }
<<<<<<< HEAD
        updateShowCorrectionSuggestionsSummary();
        updateKeyPreviewPopupDelaySummary();
        updateColorSchemeSummary(prefs, getResources());
        updateCustomInputStylesSummary();
=======
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_SHOW_SUGGESTIONS_SETTING);
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEYBOARD_LAYOUT);
        updateCustomInputStylesSummary(prefs, res);
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
    }

    @Override
Solution content 
        if (showSetupWizardIcon != null) {
            showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
        }
        updateShowCorrectionSuggestionsSummary();
        updateKeyPreviewPopupDelaySummary();
        updateColorSchemeSummary(prefs, getResources());
        updateCustomInputStylesSummary();
    }

    @Override
File
SettingsFragment.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
        }
        ensureConsistencyOfAutoCorrectionSettings();
<<<<<<< HEAD
        updateShowCorrectionSuggestionsSummary();
        updateKeyPreviewPopupDelaySummary();
        updateColorSchemeSummary(prefs, res);
=======
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_SHOW_SUGGESTIONS_SETTING);
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
        updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEYBOARD_LAYOUT);
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, getResources());
    }
Solution content 
            LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
        }
        ensureConsistencyOfAutoCorrectionSettings();
        updateShowCorrectionSuggestionsSummary();
        updateKeyPreviewPopupDelaySummary();
        updateColorSchemeSummary(prefs, res);
        refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, getResources());
    }
File
SettingsFragment.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD
                Settings.PREF_BIGRAM_PREDICTIONS, !currentSetting.equals(autoCorrectionOff));
    }

    private void updateColorSchemeSummary(final SharedPreferences prefs, final Resources res) {
        // Because the "%s" summary trick of {@link ListPreference} doesn't work properly before
        // KitKat, we need to update the summary by code.
        final Preference preference = findPreference(Settings.PREF_KEYBOARD_LAYOUT);
        if (!(preference instanceof ListPreference)) {
            Log.w(TAG, "Can't find Keyboard Color Scheme preference");
            return;
        }
        final ListPreference colorSchemePreference = (ListPreference)preference;
        final int themeIndex = Settings.readKeyboardThemeIndex(prefs, res);
        int entryIndex = colorSchemePreference.findIndexOfValue(Integer.toString(themeIndex));
        if (entryIndex < 0) {
            final int defaultThemeIndex = Settings.resetAndGetDefaultKeyboardThemeIndex(prefs, res);
            entryIndex = colorSchemePreference.findIndexOfValue(
                    Integer.toString(defaultThemeIndex));
        }
        colorSchemePreference.setSummary(colorSchemePreference.getEntries()[entryIndex]);
    }

    private void updateCustomInputStylesSummary() {
=======
    private void updateCustomInputStylesSummary(final SharedPreferences prefs,
            final Resources res) {
>>>>>>> 431fcb59380eb1f03bd0504cc8556ca143295357
        final PreferenceScreen customInputStyles =
                (PreferenceScreen)findPreference(Settings.PREF_CUSTOM_INPUT_STYLES);
        final String prefSubtype = Settings.readPrefAdditionalSubtypes(prefs, res);
Solution content 
    }

    private void updateColorSchemeSummary(final SharedPreferences prefs, final Resources res) {
        // Because the "%s" summary trick of {@link ListPreference} doesn't work properly before
        // KitKat, we need to update the summary by code.
        final Preference preference = findPreference(Settings.PREF_KEYBOARD_LAYOUT);
        if (!(preference instanceof ListPreference)) {
            Log.w(TAG, "Can't find Keyboard Color Scheme preference");
            return;
        }
        final ListPreference colorSchemePreference = (ListPreference)preference;
        final int themeIndex = Settings.readKeyboardThemeIndex(prefs, res);
        int entryIndex = colorSchemePreference.findIndexOfValue(Integer.toString(themeIndex));
        if (entryIndex < 0) {
            final int defaultThemeIndex = Settings.resetAndGetDefaultKeyboardThemeIndex(prefs, res);
            entryIndex = colorSchemePreference.findIndexOfValue(
                    Integer.toString(defaultThemeIndex));
        }
        colorSchemePreference.setSummary(colorSchemePreference.getEntries()[entryIndex]);
    }

    private void updateCustomInputStylesSummary() {
        final PreferenceScreen customInputStyles =
                (PreferenceScreen)findPreference(Settings.PREF_CUSTOM_INPUT_STYLES);
        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
        final Resources res = getResources();
        final String prefSubtype = Settings.readPrefAdditionalSubtypes(prefs, res);
File
SettingsFragment.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method signature