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

Merge "Fix order of items in language menu."

Browse Source
This commit is contained in:
Abodunrinwa Toki
2016-07-04 13:45:49 +00:00
committed by Android (Google) Code Review
parent 57949a9784 6d2a0b6424
commit 6306044706
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/android/settings/inputmethod/InputMethodSubtypePreference.java
View File

@@ -62,32 +62,29 @@ class InputMethodSubtypePreference extends SwitchWithNoTextPreference {
return 0; return 0;
} }
if (rhs instanceof InputMethodSubtypePreference) { if (rhs instanceof InputMethodSubtypePreference) {
final InputMethodSubtypePreference pref = (InputMethodSubtypePreference) rhs; final InputMethodSubtypePreference rhsPref = (InputMethodSubtypePreference) rhs;
if (mIsSystemLocale && !rhsPref.mIsSystemLocale) {
return -1;
}
if (!mIsSystemLocale && rhsPref.mIsSystemLocale) {
return 1;
}
if (mIsSystemLanguage && !rhsPref.mIsSystemLanguage) {
return -1;
}
if (!mIsSystemLanguage && rhsPref.mIsSystemLanguage) {
return 1;
}
final CharSequence t0 = getTitle(); final CharSequence t0 = getTitle();
final CharSequence t1 = rhs.getTitle(); final CharSequence t1 = rhs.getTitle();
if (TextUtils.equals(t0, t1)) { if (t0 == null && t1 == null) {
return 0; return Integer.compare(hashCode(), rhs.hashCode());
}
if (mIsSystemLocale) {
return -1;
}
if (pref.mIsSystemLocale) {
return 1;
}
if (mIsSystemLanguage) {
return -1;
}
if (pref.mIsSystemLanguage) {
return 1;
}
if (TextUtils.isEmpty(t0)) {
return 1;
}
if (TextUtils.isEmpty(t1)) {
return -1;
} }
if (t0 != null && t1 != null) {
return collator.compare(t0.toString(), t1.toString()); return collator.compare(t0.toString(), t1.toString());
} }
return t0 == null ? -1 : 1;
}
return super.compareTo(rhs); return super.compareTo(rhs);
} }
} }