diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-11 20:51:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-11 20:51:03 -0800 |
| commit | 08432a419b83fd22fe43d921c2f9d9f289e3ea3b (patch) | |
| tree | f9d12347d90818c4a5ce9b157d1b46ae64cd6cad /core/java/android/preference | |
| parent | f244e1428b5dc28dedc0b67ed45603a4f1401e69 (diff) | |
| parent | fa0d9c2fa8e5c2c73bd36688784f1e44eb08635b (diff) | |
| download | frameworks_base-08432a419b83fd22fe43d921c2f9d9f289e3ea3b.zip frameworks_base-08432a419b83fd22fe43d921c2f9d9f289e3ea3b.tar.gz frameworks_base-08432a419b83fd22fe43d921c2f9d9f289e3ea3b.tar.bz2 | |
am fa0d9c2f: am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit 'fa0d9c2fa8e5c2c73bd36688784f1e44eb08635b':
Changes to support new screen cast settings screen.
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/Preference.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index 9abd7ef..76fccc7 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -1096,11 +1096,11 @@ public class Preference implements Comparable<Preference> { * @return 0 if the same; less than 0 if this Preference sorts ahead of <var>another</var>; * greater than 0 if this Preference sorts after <var>another</var>. */ + @Override public int compareTo(Preference another) { - if (mOrder != DEFAULT_ORDER - || (mOrder == DEFAULT_ORDER && another.mOrder != DEFAULT_ORDER)) { + if (mOrder != another.mOrder) { // Do order comparison - return mOrder - another.mOrder; + return mOrder - another.mOrder; } else if (mTitle == another.mTitle) { // If titles are null or share same object comparison return 0; |