Projects >> packages_input_LatinIME >>a8b0aa59d2cf832ad86959acfd98573a049501cf

Chunk
Conflicting content 
    private SharedPreferences mPrefs;
    private String mSelectedLanguages;
    private ArrayList mAvailableLanguages = new ArrayList();
<<<<<<< HEAD
    private static final String[] BLACKLIST_LANGUAGES = {
        "ko", "ja", "zh", "el", "zz"
=======

    private static final String[] WHITELIST_LANGUAGES = {
        "cs", "da", "de", "en_GB", "en_US", "es", "es_US", "fr", "it", "nb", "nl", "pl", "pt", "ru"
>>>>>>> 454c3f3c03ef2d45a647767ae345e7d52fc4af39
    };

    private static boolean isWhitelisted(String lang) {
Solution content 
    private SharedPreferences mPrefs;
    private String mSelectedLanguages;
    private ArrayList mAvailableLanguages = new ArrayList();
    private static final String[] BLACKLIST_LANGUAGES = {
        "ko", "ja", "zh", "el", "zz"
    };
File
InputLanguageSelection.java
Developer's decision
Version 1
Kind of conflict
Array initializer
Attribute
Chunk
Conflicting content 
                    preprocess[finalSize-1].label = LanguageSwitcher.toTitleCase(
                            preprocess[finalSize-1].locale.getDisplayName());
                    preprocess[finalSize++] =
<<<<<<< HEAD
                            new Loc(SubtypeSwitcher.getFullDisplayName(l, true), l);
                } else {
                    // check previous entry:
                    //  same lang and a country -> upgrade to full name and
                    //    insert ours with full name
                    //  diff lang -> insert ours with lang-only name
                    if (preprocess[finalSize-1].mLocale.getLanguage().equals(
                            language)) {
                        preprocess[finalSize-1].setLabel(SubtypeSwitcher.getFullDisplayName(
                                preprocess[finalSize-1].mLocale, false));
                        preprocess[finalSize++] =
                                new Loc(SubtypeSwitcher.getFullDisplayName(l, false), l);
                    } else {
                        String displayName;
                        if (s.equals("zz_ZZ")) {
                            // ignore this locale
                        } else {
                            displayName = SubtypeSwitcher.getFullDisplayName(l, true);
                            preprocess[finalSize++] = new Loc(displayName, l);
                        }
=======
                            new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName()), l);
                } else {
                    String displayName;
                    if (s.equals("zz_ZZ")) {
                    } else {
                        displayName = LanguageSwitcher.toTitleCase(l.getDisplayName(l));
                        preprocess[finalSize++] = new Loc(displayName, l);
>>>>>>> 454c3f3c03ef2d45a647767ae345e7d52fc4af39
                    }
                }
            }
Solution content 
                    preprocess[finalSize++] =
                            new Loc(SubtypeSwitcher.getFullDisplayName(l, true), l);
                } else {
                    // check previous entry:
                    //  same lang and a country -> upgrade to full name and
                    //    insert ours with full name
                    //  diff lang -> insert ours with lang-only name
                    if (preprocess[finalSize-1].mLocale.getLanguage().equals(
                            language)) {
                        preprocess[finalSize-1].setLabel(SubtypeSwitcher.getFullDisplayName(
                                preprocess[finalSize-1].mLocale, false));
                        preprocess[finalSize++] =
                                new Loc(SubtypeSwitcher.getFullDisplayName(l, false), l);
                    } else {
                        String displayName;
                        if (s.equals("zz_ZZ")) {
                            // ignore this locale
                        } else {
                            displayName = SubtypeSwitcher.getFullDisplayName(l, true);
                            preprocess[finalSize++] = new Loc(displayName, l);
                        }
                    }
                }
            }
File
InputLanguageSelection.java
Developer's decision
Version 1
Kind of conflict
Array access
Comment
If statement
Method invocation
Variable