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

Commit 9859b8b0 authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix failing robotest 

Fixes: 124531152
Test: robotests
Change-Id: I4442ae543b062ef17b4bfd828134ede879d2b22d
parent 1aa75aa7

src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java

+5 −6
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro 
        // enabled subtypes. If we already have the locale-without-country version of the system

        // locale, we don't add the system locale to avoid confusion even though it's technically

        // correct to add it.

        if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) {

        if (!localeSet.contains(Locale.getDefault().getLanguage())) {

            localeSet.add(Locale.getDefault().toString());

        }



        return localeSet;

    }



    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    @VisibleForTesting

    TreeSet<String> getUserDictLocalesSet(Context context) {

        return getUserDictionaryLocalesSet(context);

    }
@@ -140,7 +140,6 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro 
     * Creates the entries that allow the user to go into the user dictionary for each locale.

     */

    private void createUserDictSettings() {



        final TreeSet<String> localeSet = getUserDictLocalesSet(mContext);

        final int prefCount = mScreen.getPreferenceCount();

        String prefKey;
@@ -160,8 +159,8 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro 
        if (prefCount > 0) {

            for (int i = prefCount - 1; i >= 0; i--) {

                prefKey = mScreen.getPreference(i).getKey();

                if (KEY_ALL_LANGUAGE.equals(prefKey)) {

                    prefKey = "";

                if (TextUtils.isEmpty(prefKey) || TextUtils.equals(KEY_ALL_LANGUAGE, prefKey)) {

                    continue;

                }

                if (!localeSet.isEmpty() && localeSet.contains(prefKey)) {

                    localeSet.remove(prefKey);

tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java

+3 −3

File changed.

Contains only whitespace changes.