Consistency in order of includes

1. Native java
2. Third party java
3. Native android
4. Third party android
5. Ours

src/org/fdroid/fdroid/AppDetails.java

@@ -25,10 +25,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import android.support.v4.view.MenuItemCompat;
-import org.fdroid.fdroid.compat.ActionBarCompat;
-import org.fdroid.fdroid.compat.MenuManager;
-import org.fdroid.fdroid.DB.CommaSeparatedList;
 import org.xml.sax.XMLReader;
 
 import android.app.AlertDialog;
@@ -68,8 +64,12 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
 import android.support.v4.app.NavUtils;
+import android.support.v4.view.MenuItemCompat;
 
 import org.fdroid.fdroid.compat.PackageManagerCompat;
+import org.fdroid.fdroid.compat.ActionBarCompat;
+import org.fdroid.fdroid.compat.MenuManager;
+import org.fdroid.fdroid.DB.CommaSeparatedList;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 

src/org/fdroid/fdroid/AppListManager.java

@@ -1,16 +1,17 @@
 package org.fdroid.fdroid;
 
+import java.util.*;
+
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.ArrayAdapter;
+
 import org.fdroid.fdroid.views.AppListAdapter;
 import org.fdroid.fdroid.views.AvailableAppListAdapter;
 import org.fdroid.fdroid.views.CanUpdateAppListAdapter;
 import org.fdroid.fdroid.views.InstalledAppListAdapter;
 
-import java.util.*;
-
 /**
  * Should be owned by the FDroid Activity, but used by the AppListFragments.
  * The idea is that it takes a non-trivial amount of time to work this stuff

src/org/fdroid/fdroid/DB.java

@@ -45,6 +45,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.preference.PreferenceManager;
 import android.text.TextUtils.SimpleStringSplitter;
 import android.util.Log;
+
 import org.fdroid.fdroid.compat.Compatibility;
 import org.fdroid.fdroid.compat.ContextCompat;
 

src/org/fdroid/fdroid/Downloader.java

@@ -20,13 +20,14 @@
 
 package org.fdroid.fdroid;
 
-import android.util.Log;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 
+import android.util.Log;
+
 public class Downloader extends Thread {
 
     private DB.Apk curapk;

src/org/fdroid/fdroid/ManageRepo.java

@@ -35,7 +35,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.view.MenuItemCompat;
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -48,6 +47,7 @@ import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
 import android.support.v4.app.NavUtils;
+import android.support.v4.view.MenuItemCompat;
 
 import org.fdroid.fdroid.compat.ActionBarCompat;
 

src/org/fdroid/fdroid/Preferences.java

@@ -1,16 +1,16 @@
 package org.fdroid.fdroid;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.prefs.PreferenceChangeListener;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
 /**
  * Handles shared preferences for FDroid, looking after the names of
  * preferences, default values and caching. Needs to be setup in the FDroidApp

src/org/fdroid/fdroid/RepoXMLHandler.java

@@ -40,14 +40,13 @@ import java.util.jar.JarFile;
 import javax.net.ssl.SSLHandshakeException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
-import android.os.Bundle;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
+import android.os.Bundle;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;

src/org/fdroid/fdroid/SearchResults.java

@@ -21,8 +21,6 @@ package org.fdroid.fdroid;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.support.v4.view.MenuItemCompat;
-
 import android.app.ListActivity;
 import android.app.SearchManager;
 import android.content.Intent;
@@ -36,6 +34,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import android.support.v4.app.NavUtils;
+import android.support.v4.view.MenuItemCompat;
 
 import org.fdroid.fdroid.compat.ActionBarCompat;
 import org.fdroid.fdroid.views.AppListAdapter;

src/org/fdroid/fdroid/UpdateService.java

@@ -35,6 +35,7 @@ import android.os.ResultReceiver;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.util.Log;
+
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 

src/org/fdroid/fdroid/compat/Compatibility.java

@@ -1,6 +1,7 @@
 package org.fdroid.fdroid.compat;
 
 import android.os.Build;
+
 import org.fdroid.fdroid.Utils;
 
 public abstract class Compatibility {

src/org/fdroid/fdroid/compat/ContextCompat.java

@@ -1,10 +1,10 @@
 package org.fdroid.fdroid.compat;
 
+import java.io.File;
+
 import android.content.Context;
 import android.os.Environment;
 
-import java.io.File;
-
 public abstract class ContextCompat extends Compatibility {
 
     public static ContextCompat create(Context context) {

src/org/fdroid/fdroid/compat/TabManager.java

@@ -1,18 +1,20 @@
 package org.fdroid.fdroid.compat;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import android.app.ActionBar;
 import android.app.FragmentTransaction;
 import android.content.res.Configuration;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
+
+import android.support.v4.view.ViewPager;
+
 import org.fdroid.fdroid.FDroid;
 import org.fdroid.fdroid.R;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class TabManager extends Compatibility {
 
     public static final int INDEX_AVAILABLE  = 0;

src/org/fdroid/fdroid/views/AppListAdapter.java

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
+
 import org.fdroid.fdroid.DB;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;

src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java

@@ -2,6 +2,7 @@ package org.fdroid.fdroid.views;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
+
 import org.fdroid.fdroid.FDroid;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.fragments.AvailableAppsFragment;

src/org/fdroid/fdroid/views/fragments/AppListFragment.java

@@ -3,11 +3,13 @@ package org.fdroid.fdroid.views.fragments;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
+
+import android.support.v4.app.Fragment;
+
 import org.fdroid.fdroid.*;
 import org.fdroid.fdroid.views.AppListAdapter;
 import org.fdroid.fdroid.views.AppListView;

src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import org.fdroid.fdroid.views.AppListAdapter;
 
 public class CanUpdateAppsFragment extends AppListFragment {

src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import org.fdroid.fdroid.views.AppListAdapter;
 
 public class InstalledAppsFragment extends AppListFragment {