PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing robotest

Browse Source 
Fixes: 124531152
Test: robotests
Change-Id: I4442ae543b062ef17b4bfd828134ede879d2b22d
This commit is contained in:
Fan Zhang
2019-02-15 15:46:58 -08:00
parent 1aa75aa71a
commit 9859b8b0b0
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
View File

@@ -79,7 +79,7 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro
@NonNull @NonNull
public static TreeSet<String> getUserDictionaryLocalesSet(Context context) { public static TreeSet<String> getUserDictionaryLocalesSet(Context context) {
final Cursor cursor = context.getContentResolver().query( final Cursor cursor = context.getContentResolver().query(
UserDictionary.Words.CONTENT_URI, new String[] {UserDictionary.Words.LOCALE}, UserDictionary.Words.CONTENT_URI, new String[]{UserDictionary.Words.LOCALE},
null, null, null); null, null, null);
final TreeSet<String> localeSet = new TreeSet<>(); final TreeSet<String> localeSet = new TreeSet<>();
if (cursor == null) { if (cursor == null) {
@@ -124,14 +124,14 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro
// enabled subtypes. If we already have the locale-without-country version of the system // 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 // locale, we don't add the system locale to avoid confusion even though it's technically
// correct to add it. // correct to add it.
if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) { if (!localeSet.contains(Locale.getDefault().getLanguage())) {
localeSet.add(Locale.getDefault().toString()); localeSet.add(Locale.getDefault().toString());
} }
return localeSet; return localeSet;
} }
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) @VisibleForTesting
TreeSet<String> getUserDictLocalesSet(Context context) { TreeSet<String> getUserDictLocalesSet(Context context) {
return getUserDictionaryLocalesSet(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. * Creates the entries that allow the user to go into the user dictionary for each locale.
*/ */
private void createUserDictSettings() { private void createUserDictSettings() {
final TreeSet<String> localeSet = getUserDictLocalesSet(mContext); final TreeSet<String> localeSet = getUserDictLocalesSet(mContext);
final int prefCount = mScreen.getPreferenceCount(); final int prefCount = mScreen.getPreferenceCount();
String prefKey; String prefKey;
@@ -160,8 +159,8 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro
if (prefCount > 0) { if (prefCount > 0) {
for (int i = prefCount - 1; i >= 0; i--) { for (int i = prefCount - 1; i >= 0; i--) {
prefKey = mScreen.getPreference(i).getKey(); prefKey = mScreen.getPreference(i).getKey();
if (KEY_ALL_LANGUAGE.equals(prefKey)) { if (TextUtils.isEmpty(prefKey) || TextUtils.equals(KEY_ALL_LANGUAGE, prefKey)) {
prefKey = ""; continue;
} }
if (!localeSet.isEmpty() && localeSet.contains(prefKey)) { if (!localeSet.isEmpty() && localeSet.contains(prefKey)) {
localeSet.remove(prefKey); localeSet.remove(prefKey);

6
tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java
View File

@@ -142,9 +142,9 @@ public class UserDictionaryListControllerTest {
String sortOrder) { String sortOrder) {
if (hasDictionary) { if (hasDictionary) {
final MatrixCursor cursor = new MatrixCursor( final MatrixCursor cursor = new MatrixCursor(
new String[] {UserDictionary.Words.LOCALE}); new String[]{UserDictionary.Words.LOCALE});
cursor.addRow(new Object[] {"en"}); cursor.addRow(new Object[]{"en"});
cursor.addRow(new Object[] {"es"}); cursor.addRow(new Object[]{"es"});
return cursor; return cursor;
} else { } else {
return null; return null;