Merge "Fix bug #3333939 (Add secondary Account UI needs some love)" into honeycomb

src/com/android/settings/accounts/AccountSyncSettings.java

@@ -55,6 +55,7 @@ import android.widget.TextView;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -212,7 +213,6 @@ public class AccountSyncSettings extends AccountPreferenceBase {
         String title = getString(R.string.sync_item_title, providerLabel);
         item.setTitle(title);
         item.setKey(authority);
-        getPreferenceScreen().addPreference(item);
         mCheckBoxes.add(item);
     }
 
@@ -472,6 +472,11 @@ public class AccountSyncSettings extends AccountPreferenceBase {
                 }
             }
         }
+
+        Collections.sort(mCheckBoxes);
+        for (int i = 0, n = mCheckBoxes.size(); i < n; i++) {
+            getPreferenceScreen().addPreference(mCheckBoxes.get(i));
+        }
     }
 
     /**