Optimize imports, remove statistics constants

api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -24,6 +21,9 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
 /**
  * AbstractDatabase is a database abstraction which wraps a SQLite database.
  * <p>

api/src/main/java/com/todoroo/andlib/data/AbstractModel.java

@@ -5,15 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -24,6 +15,15 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * <code>AbstractModel</code> represents a row in a database.
  * <p>

api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java

@@ -5,14 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteTransactionListener;
@@ -26,6 +18,14 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.OutstandingEntry;
 import com.todoroo.astrid.data.SyncFlags;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 
 /**

api/src/main/java/com/todoroo/andlib/data/Property.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import static com.todoroo.andlib.sql.SqlConstants.COMMA;
-import static com.todoroo.andlib.sql.SqlConstants.LEFT_PARENTHESIS;
-import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS;
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.sql.Criterion;
@@ -16,6 +12,11 @@ import com.todoroo.andlib.sql.Field;
 import com.todoroo.andlib.sql.Operator;
 import com.todoroo.andlib.sql.UnaryCriterion;
 
+import static com.todoroo.andlib.sql.SqlConstants.COMMA;
+import static com.todoroo.andlib.sql.SqlConstants.LEFT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 /**
  * Property represents a typed column in a database.
  *

api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java

@@ -5,13 +5,13 @@
  */
 package com.todoroo.andlib.data;
 
-import java.util.WeakHashMap;
-
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
 import com.todoroo.andlib.data.Property.PropertyVisitor;
 
+import java.util.WeakHashMap;
+
 /**
  * AstridCursor wraps a cursor and allows users to query for individual
  * {@link Property} types or read an entire {@link AbstractModel} from

api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java

@@ -5,12 +5,12 @@
  */
 package com.todoroo.andlib.service;
 
+import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
+
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 
-import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
-
 /**
  * A Dependency Injector knows how to inject certain dependencies based
  * on the field that is passed in. You will need to write your own initialization

api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java

@@ -5,12 +5,12 @@
  */
 package com.todoroo.andlib.service;
 
-import java.lang.reflect.Field;
-import java.util.LinkedList;
-
 import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter;
 import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
 
+import java.lang.reflect.Field;
+import java.util.LinkedList;
+
 
 
 /**

api/src/main/java/com/todoroo/andlib/service/HttpRestClient.java

@@ -5,10 +5,9 @@
  */
 package com.todoroo.andlib.service;
 
-import java.io.IOException;
+import android.util.Log;
-import java.io.InputStream;
+
-import java.lang.ref.WeakReference;
+import com.todoroo.andlib.utility.AndroidUtilities;
-import java.util.zip.GZIPInputStream;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -37,9 +36,10 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HttpContext;
 
-import android.util.Log;
+import java.io.IOException;
-
+import java.io.InputStream;
-import com.todoroo.andlib.utility.AndroidUtilities;
+import java.lang.ref.WeakReference;
+import java.util.zip.GZIPInputStream;
 
 /**
  * RestClient allows Android to consume web requests.

api/src/main/java/com/todoroo/andlib/service/RestClient.java

@@ -5,11 +5,11 @@
  */
 package com.todoroo.andlib.service;
 
-import java.io.IOException;
-
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 
+import java.io.IOException;
+
 /**
  * RestClient stub invokes the HTML requests as desired
  *

api/src/main/java/com/todoroo/andlib/sql/Operator.java

@@ -5,11 +5,11 @@
  */
 package com.todoroo.andlib.sql;
 
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 public final class Operator {
 
     private final String operator;

api/src/main/java/com/todoroo/andlib/sql/Order.java

@@ -5,11 +5,11 @@
  */
 package com.todoroo.andlib.sql;
 
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 public class Order {
     private final Object expression;
     private final List<Order> secondaryExpressions;

api/src/main/java/com/todoroo/andlib/sql/Query.java

@@ -5,6 +5,17 @@
  */
 package com.todoroo.andlib.sql;
 
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.todoroo.andlib.data.Property;
+import com.todoroo.astrid.api.AstridApiConstants;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import static com.todoroo.andlib.sql.SqlConstants.ALL;
 import static com.todoroo.andlib.sql.SqlConstants.COMMA;
 import static com.todoroo.andlib.sql.SqlConstants.DISTINCT;
@@ -21,17 +32,6 @@ import static com.todoroo.andlib.sql.SqlConstants.WHERE;
 import static com.todoroo.andlib.sql.SqlTable.table;
 import static java.util.Arrays.asList;
 
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.net.Uri;
-
-import com.todoroo.andlib.data.Property;
-import com.todoroo.astrid.api.AstridApiConstants;
-
 public final class Query {
 
     private SqlTable table;

api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java

@@ -5,6 +5,8 @@
  */
 package com.todoroo.andlib.sql;
 
+import java.util.ArrayList;
+
 import static com.todoroo.andlib.sql.SqlConstants.COMMA;
 import static com.todoroo.andlib.sql.SqlConstants.GROUP_BY;
 import static com.todoroo.andlib.sql.SqlConstants.LIMIT;
@@ -13,8 +15,6 @@ import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import static com.todoroo.andlib.sql.SqlConstants.WHERE;
 import static java.util.Arrays.asList;
 
-import java.util.ArrayList;
-
 /**
  * Query Template returns a bunch of criteria that allows a query to be
  * constructed

api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java

@@ -5,6 +5,12 @@
  */
 package com.todoroo.andlib.utility;
 
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
+
+import org.tasks.api.R;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -12,12 +18,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import android.content.Context;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-import org.tasks.api.R;
-
 
 public class DateUtilities {
 

api/src/main/java/com/todoroo/astrid/api/Filter.java

@@ -9,7 +9,6 @@ import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.QueryTemplate;
 
 /**

api/src/main/java/com/todoroo/astrid/api/PermaSql.java

@@ -5,10 +5,10 @@
  */
 package com.todoroo.astrid.api;
 
-import java.util.Date;
-
 import com.todoroo.andlib.utility.DateUtilities;
 
+import java.util.Date;
+
 /**
  * PermaSql allows for creating SQL statements that can be saved and used
  * later without dates getting stale. It also allows these values to be

api/src/main/java/com/todoroo/astrid/data/RemoteModel.java

@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.data;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -26,6 +17,15 @@ import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
 /**
  * A model that is synchronized to a remote server and has a remote id
  *

api/src/main/java/com/todoroo/astrid/data/Task.java

@@ -6,8 +6,6 @@
 package com.todoroo.astrid.data;
 
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.content.res.Resources;
 import android.net.Uri;
@@ -21,8 +19,11 @@ import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
+
 import org.tasks.api.R;
 
+import java.util.Date;
+
 /**
  * Data Model which represents a task users need to accomplish.
  *

api/src/main/java/com/todoroo/astrid/sync/SyncBackgroundService.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -22,6 +20,8 @@ import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Performs synchronization service logic in background service to avoid
  * ANR (application not responding) messages.

api/src/main/java/com/todoroo/astrid/sync/SyncContainer.java

@@ -5,12 +5,12 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.ArrayList;
-
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 
+import java.util.ArrayList;
+
 /**
  * Container class for transmitting tasks and including local and remote
  * metadata. Synchronization Providers can subclass this class if desired.

api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Set;
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -27,8 +23,13 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
+
 import org.tasks.api.R;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Set;
+
 /**
  * Utility class for common synchronization action: displaying synchronization
  * preferences and an action panel so users can initiate actions from the menu.

api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -23,6 +21,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.AstridApiConstants;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Performs synchronization service logic in background service to avoid
  * ANR (application not responding) messages.

api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java

@@ -5,14 +5,14 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.io.IOException;
-
 import android.app.Activity;
 
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 
+import java.io.IOException;
+
 
 abstract public class SyncV2Provider {
 

api/src/main/res/values-ca/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 any</item>
 		<item quantity="other">%d anys</item>

api/src/main/res/values-cs/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 rok</item>
 		<item quantity="other">%d Roky</item>

api/src/main/res/values-da/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 år</item>
 		<item quantity="other">%d År</item>

api/src/main/res/values-de/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">Ein Jahr</item>
 		<item quantity="other">%d Jahre</item>

api/src/main/res/values-es/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 año</item>
 		<item quantity="other">%d años</item>

api/src/main/res/values-fr/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 an</item>
 		<item quantity="other">%d ans</item>

api/src/main/res/values-it/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 Anno</item>
 		<item quantity="other">%d Anni</item>

api/src/main/res/values-iw/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">שנה</item>
 		<item quantity="other">%d שנים</item>

api/src/main/res/values-ja/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1年</item>
 		<item quantity="other">%d 年</item>

api/src/main/res/values-ko/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1년</item>
 		<item quantity="other">%d년</item>

api/src/main/res/values-nb/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 år</item>
 		<item quantity="other">%d år</item>

api/src/main/res/values-nl/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 jaar</item>
 		<item quantity="other">%d jaren</item>

api/src/main/res/values-pl/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 rok</item>
 		<item quantity="other">%d lat</item>

api/src/main/res/values-pt-rBR/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 ano</item>
 		<item quantity="other">%d anos</item>

api/src/main/res/values-pt/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 Ano</item>
 		<item quantity="other">%d Anos</item>

api/src/main/res/values-ru/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 год</item>
 		<item quantity="other">%d года/лет</item>

api/src/main/res/values-sv/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 år</item>
 		<item quantity="other">%d år</item>

api/src/main/res/values-th/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_days">
 		<item quantity="one">1 วัน</item>
 		<item quantity="other">%d วัน</item>

api/src/main/res/values-tr/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 Yıl</item>
 		<item quantity="other">%d Yıl</item>

api/src/main/res/values-uk/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 Рік</item>
 		<item quantity="other">%d років</item>

api/src/main/res/values-zh-rCN/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 年</item>
 		<item quantity="other">%d 年</item>

api/src/main/res/values-zh-rTW/strings.xml

@@ -4,7 +4,7 @@
 <!-- ******** http://www.getlocalization.com/tasks_android ******** -->
 <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
 <!-- ************************************************************** -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 	<plurals name="DUt_years">
 		<item quantity="one">1 年</item>
 		<item quantity="other">%d 年</item>

api/src/main/res/values/colors.xml

@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
     
     <color name="importance_1">#ffff5555</color>
     <color name="importance_2">#fffea400</color>

api/src/main/res/values/keys.xml

@@ -3,7 +3,7 @@
   This file contains preference keys and preference list values.
   These should not be translated 
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
  
   <!-- ============================================================ SYNC == -->
   

api/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
   <!-- ==================================================== Generic Units == -->
   

astrid/src/instrumentTest/java/com/todoroo/andlib/service/DependencyInjectionTests.java

@@ -5,10 +5,10 @@
  */
 package com.todoroo.andlib.service;
 
-import java.lang.reflect.Field;
-
 import android.test.AndroidTestCase;
 
+import java.lang.reflect.Field;
+
 public class DependencyInjectionTests extends AndroidTestCase {
 
     public void testNoAutowire() {

astrid/src/instrumentTest/java/com/todoroo/andlib/test/SimpleAndroidTest.java

@@ -5,9 +5,10 @@
  */
 package com.todoroo.andlib.test;
 
-import junit.framework.Assert;
 import android.test.AndroidTestCase;
 
+import junit.framework.Assert;
+
 public class SimpleAndroidTest extends AndroidTestCase {
 
 	public void testSimpleAssert() throws Throwable {

astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCase.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.andlib.test;
 
-import java.util.Locale;
-
 import android.content.res.Configuration;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
@@ -15,6 +13,8 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.util.Locale;
+
 /**
  * Base test case for Astrid tests
  *

astrid/src/instrumentTest/java/com/todoroo/andlib/test/TranslationTests.java

@@ -6,6 +6,9 @@
 package com.todoroo.andlib.test;
 
 
+import android.content.res.Resources;
+
+import org.tasks.R;
 
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
@@ -14,10 +17,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import android.content.res.Resources;
-
-import org.tasks.R;
-
 /**
  * Tests translations for consistency with the default values. You must
  * extend this class and create it with your own values for strings

astrid/src/instrumentTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java

@@ -5,13 +5,13 @@
  */
 package com.todoroo.andlib.utility;
 
+import com.todoroo.andlib.test.TodorooTestCase;
+
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import com.todoroo.andlib.test.TodorooTestCase;
-
 public class DateUtilitiesTest extends TodorooTestCase {
 
     public void set24Hour(boolean is24) {

astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java

@@ -5,20 +5,21 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.backup.BackupService.BackupDirectorySetting;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
-import com.todoroo.andlib.utility.Preferences;
+
+import org.tasks.R;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class BackupServiceTests extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +20,9 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GtasksDetailExposerTest extends DatabaseTestCase {
 
     @Autowired private GtasksListService gtasksListService;

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,6 +14,9 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksIndentActionTest extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,6 +14,9 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,6 +14,9 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksTaskMovingTest extends DatabaseTestCase {
 

astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.model;
 
-import java.util.ArrayList;
-import java.util.TreeSet;
-
 import android.content.ContentValues;
 
 import com.todoroo.andlib.service.Autowired;
@@ -17,6 +14,9 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.TreeSet;
+
 public class TaskTests extends DatabaseTestCase {
 
     @Autowired

astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java

@@ -5,12 +5,9 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import android.app.Notification;
 import android.content.Intent;
 
-import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.NotificationManager;
 import com.todoroo.andlib.utility.DateUtilities;
@@ -19,6 +16,10 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import org.tasks.R;
+
+import java.util.Date;
+
 public class NotificationTests extends DatabaseTestCase {
 
     @Autowired

astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/ReminderServiceTests.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.dao.TaskDao;
@@ -15,6 +13,8 @@ import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.Date;
+
 public class ReminderServiceTests extends DatabaseTestCase {
 
     ReminderService service;

astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTests.java

@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
@@ -18,6 +13,11 @@ import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
 public class AdvancedRepeatTests extends TodorooTestCase {
 
 

astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java

@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.TimeZone;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
@@ -18,6 +13,11 @@ import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
 public class RepeatAfterCompleteTests extends TodorooTestCase {
 
     private Task task;

astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java

@@ -5,13 +5,13 @@
  */
 package com.todoroo.astrid.service;
 
+import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.test.DatabaseTestCase;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.test.DatabaseTestCase;
-
 public class QuickAddMarkupTest extends DatabaseTestCase {
 
     @Override

astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java

@@ -6,18 +6,19 @@
 package com.todoroo.astrid.service;
 
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
-import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.TitleParser;
 
+import org.tasks.R;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
 public class TitleParserTest extends DatabaseTestCase {
 
     @Override

astrid/src/instrumentTest/java/com/todoroo/astrid/service/UpdateMessageServiceTest.java

@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.io.IOException;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.json.JSONArray;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.astrid.dao.StoreObjectDao;
@@ -19,6 +13,12 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.Constants;
 
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.json.JSONArray;
+
+import java.io.IOException;
+
 public class UpdateMessageServiceTest extends DatabaseTestCase {
 
     @Autowired private StoreObjectDao storeObjectDao;

astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.test;
 
-import java.io.File;
-
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.test.TodorooTestCaseWithInjector;
 import com.todoroo.astrid.dao.Database;
@@ -14,6 +12,8 @@ import com.todoroo.astrid.legacy.AlarmDatabase;
 import com.todoroo.astrid.provider.ProviderTestUtilities;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.io.File;
+
 /**
  * Test case that automatically sets up and tears down a test database
  *

astrid/src/instrumentTest/java/com/zutubi/android/junitreport/Compatibility.java

@@ -1,12 +1,12 @@
 package com.zutubi.android.junitreport;
 
-import java.io.File;
-import java.lang.reflect.Method;
-
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
 
+import java.io.File;
+import java.lang.reflect.Method;
+
 /**
  * Utilities for backwards-compatibility with early Android versions.
  */

astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportListener.java

@@ -16,13 +16,9 @@
 
 package com.zutubi.android.junitreport;
 
-import java.io.File;
+import android.content.Context;
-import java.io.FileOutputStream;
+import android.util.Log;
-import java.io.IOException;
+import android.util.Xml;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Locale;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -31,9 +27,13 @@ import junit.framework.TestListener;
 
 import org.xmlpull.v1.XmlSerializer;
 
-import android.content.Context;
+import java.io.File;
-import android.util.Log;
+import java.io.FileOutputStream;
-import android.util.Xml;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Custom test listener that outputs test results to XML files. The files

astrid/src/main/java/com/commonsware/cwac/tlv/TouchListView.java

@@ -33,10 +33,11 @@ import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.ui.ErrorCatchingListView;
 
+import org.tasks.R;
+
 public class TouchListView extends ErrorCatchingListView {
 	private ImageView mDragView;
 	private View mOriginalView;

astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java

@@ -5,9 +5,6 @@
  */
 package com.mdimension.jchronic;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import com.mdimension.jchronic.handlers.Handler;
 import com.mdimension.jchronic.numerizer.Numerizer;
 import com.mdimension.jchronic.repeaters.Repeater;
@@ -20,6 +17,9 @@ import com.mdimension.jchronic.tags.TimeZone;
 import com.mdimension.jchronic.utils.Span;
 import com.mdimension.jchronic.utils.Token;
 
+import java.util.LinkedList;
+import java.util.List;
+
 public class AstridChronic {
   public static final String VERSION = "0.2.3";
 

astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -22,10 +18,15 @@ import android.provider.MediaStore;
 import android.support.v4.app.Fragment;
 import android.widget.ArrayAdapter;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 
+import org.tasks.R;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
 public class ActFmCameraModule {
 
     protected static final int REQUEST_CODE_CAMERA = 1;

astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -27,10 +23,15 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
 
+import org.tasks.R;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This activity allows users to sign in or log in to Google Tasks
  * through the Android account manager

astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java

@@ -12,11 +12,12 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.service.ThemeService;
 
+import org.tasks.R;
+
 public class CommentsActivity extends AstridActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java

@@ -2,7 +2,6 @@ package com.todoroo.astrid.actfm;
 
 import android.content.Intent;
 import android.database.Cursor;
-import android.view.ViewGroup;
 import android.widget.ListView;
 
 import com.todoroo.andlib.service.Autowired;

astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java

@@ -5,16 +5,12 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.Map.Entry;
-import java.util.Set;
-
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -23,6 +19,11 @@ import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.FilterWithUpdate;
 import com.todoroo.astrid.data.Task;
 
+import org.tasks.R;
+
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * This activity is launched when a user opens up a notification from the
  * tray. It launches the appropriate activity based on the passed in parameters.

astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java

@@ -13,9 +13,10 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
-import org.tasks.R;
 import com.todoroo.astrid.core.SortHelper;
 
+import org.tasks.R;
+
 /**
  * Shows the sort / hidden dialog
  *

astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -5,17 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.PendingIntent.CanceledException;
@@ -55,7 +44,6 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.LongProperty;
@@ -90,6 +78,16 @@ import com.todoroo.astrid.timers.TimerDecorationExposer;
 import com.todoroo.astrid.ui.CheckableImageView;
 import com.todoroo.astrid.utility.Constants;
 
+import org.tasks.R;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Adapter for displaying a user's tasks as a list
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.Date;
-import java.util.LinkedHashSet;
-
 import android.app.Activity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +13,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Metadata;
@@ -26,6 +22,11 @@ import com.todoroo.astrid.ui.DateAndTimeDialog;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.ui.DateAndTimePicker;
 
+import org.tasks.R;
+
+import java.util.Date;
+import java.util.LinkedHashSet;
+
 /**
  * Control set to manage adding and removing tags
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.Date;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -18,6 +16,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Metadata;
 
+import java.util.Date;
+
 /**
  * Exposes Task Detail for tags, i.e. "Tags: frogs, animals"
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -33,6 +29,10 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.MetadataService.SynchronizeMetadataCallback;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashSet;
+
 /**
  * Provides operations for working with alerts
  *

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.LinkedHashSet;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -17,6 +15,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Metadata;
 
+import java.util.LinkedHashSet;
+
 public class AlarmTaskRepeatListener extends BroadcastReceiver {
 
     @Override

astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java

@@ -5,10 +5,10 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-
 import android.os.Environment;
 
+import java.io.File;
+
 
 /**
  * Constants for backup XML attributes and nodes.

astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java

@@ -5,13 +5,13 @@
  */
 package com.todoroo.astrid.backup;
 
+import android.util.Log;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import android.util.Log;
-
 /**
  * Date Utility functions for backups
  *

astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java

@@ -5,17 +5,18 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.FilenameFilter;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.util.Log;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import org.tasks.R;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
 public class FilePickerBuilder extends AlertDialog.Builder implements DialogInterface.OnClickListener {
 
     public interface OnFilePickedListener {

astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.calls;
 
-import java.util.Date;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -18,11 +16,14 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import org.tasks.R;
+
+import java.util.Date;
+
 public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
     private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number";

astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -15,7 +12,6 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
@@ -35,6 +31,11 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import org.tasks.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Exposes Astrid's built in filters to the {@link FilterListFragment}
  *

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -36,7 +29,6 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
-import org.tasks.R;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
@@ -59,6 +51,15 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import org.tasks.R;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Activity that allows users to build custom filters
  *

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java

@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.List;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -22,12 +20,15 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.tasks.R;
 import com.todoroo.astrid.api.MultipleSelectCriterion;
 import com.todoroo.astrid.api.TextInputCriterion;
 import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;
 import com.todoroo.astrid.data.AddOn;
 
+import org.tasks.R;
+
+import java.util.List;
+
 /**
  * Adapter for {@link AddOn}s
  *

astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java

@@ -11,12 +11,13 @@ import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 import com.todoroo.astrid.gcal.Calendars;
 
+import org.tasks.R;
+
 /**
  * Displays the preference screen for users to edit their preferences
  *

astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.HashMap;
-import java.util.List;
-
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -21,7 +18,6 @@ import android.text.Spannable;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.api.TaskDecoration;
@@ -29,6 +25,11 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.files.FilesAction;
 import com.todoroo.astrid.notes.NotesAction;
 
+import org.tasks.R;
+
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * Exposes {@link TaskDecoration} for phone numbers, emails, urls, etc
  *

astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 
@@ -32,6 +29,9 @@ import com.todoroo.astrid.provider.Astrid2TaskProvider;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+
 /**
  * Data Access layer for {@link Metadata}-related operations.
  *

astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java

@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 
@@ -35,6 +27,14 @@ import com.todoroo.astrid.data.TagMetadata;
 import com.todoroo.astrid.data.TagOutstanding;
 import com.todoroo.astrid.tags.TagMemberMetadata;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Data Access layer for {@link Metadata}-related operations.
  *

astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 
@@ -23,6 +20,9 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TaskAttachment;
 import com.todoroo.astrid.data.TaskAttachmentOutstanding;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Data Access layer for {@link TagData}-related operations.
  *

astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java

@@ -10,7 +10,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteConstraintException;
 
-import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -29,6 +28,8 @@ import com.todoroo.astrid.data.TaskApiDao;
 import com.todoroo.astrid.reminders.Notifications;
 import com.todoroo.astrid.reminders.ReminderService;
 
+import org.tasks.R;
+
 /**
  * Data Access layer for {@link Task}-related operations.
  *

astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -17,12 +14,16 @@ import android.view.View.OnClickListener;
 import android.widget.Chronometer;
 import android.widget.Toast;
 
-import org.tasks.R;
 import com.todoroo.aacenc.AACRecorder;
 import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks;
 import com.todoroo.aacenc.AACToM4A;
 import com.todoroo.andlib.utility.DialogUtilities;
 
+import org.tasks.R;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class AACRecordingActivity extends Activity implements AACRecorderCallbacks {
 
     public static final String EXTRA_TEMP_FILE = "tempFile"; //$NON-NLS-1$

astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java

@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -25,9 +21,14 @@ import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 
+import org.tasks.R;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+
 /**
  * Based on the Android-File-Explore project by Manish Burman
  * https://github.com/mburman/Android-File-Explore

astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java

@@ -5,19 +5,20 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.content.Context;
 import android.text.TextUtils;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.TaskAttachment;
 
+import org.tasks.R;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class FileUtilities {
 
     /**

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java

@@ -1,9 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.BroadcastReceiver;
@@ -15,13 +11,18 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import org.tasks.R;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
 public class CalendarAlarmReceiver extends BroadcastReceiver {
 
     public static final int REQUEST_CODE_CAL_REMINDER = 100;

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java

@@ -1,7 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.Date;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
@@ -11,11 +9,14 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
+import org.tasks.R;
+
+import java.util.Date;
+
 public class CalendarAlarmScheduler {
 
     public static final String TAG = "calendar-alarm";