Rebrand as Tasks

* Change package to org.tasks
* Replace 'Astrid' with 'Tasks' in string files
* Replace icons
* Remove no_activity_container
* Remove unused drawables

README.md

@@ -1,14 +1,15 @@
 Getting Started With Development
 ---------------
 
-Astrid is built with [the new Android build system](http://tools.android.com/tech-docs/new-build-system).
+Tasks is built with [the new Android build system](http://tools.android.com/tech-docs/new-build-system).
 
 You must install [Gradle](http://www.gradle.org/) and [Android Studio](http://developer.android.com/sdk/installing/studio.html). Eclipse is not yet supported by the new build system.
 
 To Do
 -----
-* TeamCity
 * DropBox
+* Browser extensions
+* Continuous Build
 * Widgets
 * Translation workflow
 * Remove dead code

api/src/main/AndroidManifest.xml

@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.astrid.api"
+      package="org.tasks.api"
       android:versionCode="1"
       android:versionName="1.0">
 
     <uses-sdk android:minSdkVersion="3" />
 
-</manifest> 
+</manifest> 

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

@@ -14,7 +14,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.util.Log;
 
-import org.astrid.api.R;
+import org.tasks.api.R;
 
 /**
  * Exception handling utility class - reports and logs errors

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

@@ -16,7 +16,7 @@ import android.content.Context;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 
-import org.astrid.api.R;
+import org.tasks.api.R;
 
 
 public class DateUtilities {

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

@@ -15,7 +15,7 @@ import android.content.DialogInterface;
 import android.view.View;
 import android.webkit.WebView;
 
-import org.astrid.api.R;
+import org.tasks.api.R;
 
 public class DialogUtilities {
 

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

@@ -20,12 +20,12 @@ public class AstridApiConstants {
     /**
      * Astrid broadcast base package name
      */
-    public static final String API_PACKAGE = "org.astrid";
+    public static final String API_PACKAGE = "org.tasks";
 
     /**
      * Astrid app base package name
      */
-    public static final String ASTRID_PACKAGE = "org.astrid";
+    public static final String ASTRID_PACKAGE = "org.tasks";
 
     /**
      * Permission for reading tasks and receiving to GET_FILTERS intent

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

@@ -21,7 +21,7 @@ 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.astrid.api.R;
+import org.tasks.api.R;
 
 /**
  * Data Model which represents a task users need to accomplish.

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

@@ -24,7 +24,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.service.NotificationManager;
 import com.todoroo.andlib.utility.DialogUtilities;
-import org.astrid.api.R;
+import org.tasks.api.R;
 import com.todoroo.astrid.data.Task;
 
 /**

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

@@ -27,7 +27,7 @@ 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.astrid.api.R;
+import org.tasks.api.R;
 
 /**
  * Utility class for common synchronization action: displaying synchronization

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

@@ -95,7 +95,7 @@
   <string name="sync_SPr_sync_log_in">Přihlásit se &amp; Synchronizovat!</string>
   <string name="sync_SPr_logged_in_prefix">Přihlášen jako:</string>
   <string name="sync_SPr_last_error">Stavové hlášení</string>
-  <string name="sync_SPr_last_error_subtitle">Klepnutím odešlete zprávu týmu Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Klepnutím odešlete zprávu týmu Tasks</string>
   <string name="sync_SPr_send_report">Odeslat zprávu</string>
   <string name="sync_SPr_forget">Odhlásit se</string>
   <string name="sync_SPr_forget_description">Smazat všechny synchronizační data</string>

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Statusbericht</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klicke um einen Bericht ans Astrid-Team zu senden</string>
+  <string name="sync_SPr_last_error_subtitle">Klicke um einen Bericht ans Tasks-Team zu senden</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Bericht senden</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Reporte de estado</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click para enviar un reporte al equipo de Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Click para enviar un reporte al equipo de Tasks</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Enviar reporte</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Rapport d\'état</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Cliquez pour envoyer un rapport à l\'équipe Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Cliquez pour envoyer un rapport à l\'équipe Tasks</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Envoyer le rapport</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Status report</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">"Clicca  per inviare un rapporto al team Astrid"</string>
+  <string name="sync_SPr_last_error_subtitle">"Clicca  per inviare un rapporto al team Tasks"</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Invia rapporto</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Status report</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Tasks team</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Send report</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Statusrapport</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klik om een rapport naar het Astrid team te versturen</string>
+  <string name="sync_SPr_last_error_subtitle">Klik om een rapport naar het Tasks team te versturen</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Rapport verzenden</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Raport statusu</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Kliknij by wysłać raport do zespłu Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Kliknij by wysłać raport do zespłu Tasks</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Wyślij raport</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Relatório de status</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Clique para enviar um relatório para a equipe do Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Clique para enviar um relatório para a equipe do Tasks</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Enviar relatório</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Отчёт о состоянии</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Нажмите, чтобы отправить отчет команде Astrid</string>
+  <string name="sync_SPr_last_error_subtitle">Нажмите, чтобы отправить отчет команде Tasks</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Отправить отчет</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Status rapport</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klicka för att skicka en rapport till Astrid-teamet</string>
+  <string name="sync_SPr_last_error_subtitle">Klicka för att skicka en rapport till Tasks-teamet</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Skicka rapport</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Durum Raporu</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Astrid takımına bildirmek için tıklayın</string>
+  <string name="sync_SPr_last_error_subtitle">Tasks takımına bildirmek için tıklayın</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Rapor Gönder</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">状态报告</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">点击给 Astrid 团队发送报告</string>
+  <string name="sync_SPr_last_error_subtitle">点击给 Tasks 团队发送报告</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">发送报告</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">狀態報告</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">點擊給 Astrid 團隊發送報告</string>
+  <string name="sync_SPr_last_error_subtitle">點擊給 Tasks 團隊發送報告</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">發送報告</string>
   

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

@@ -214,7 +214,7 @@
   <string name="sync_SPr_last_error">Status report</string>
   
   <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Tasks team</string>
   <!-- Sync: send error report button -->
   <string name="sync_SPr_send_report">Send report</string>
   

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

@@ -16,7 +16,7 @@ import java.util.Locale;
 
 import android.content.res.Resources;
 
-import org.astrid.R;
+import org.tasks.R;
 
 /**
  * Tests translations for consistency with the default values. You must

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

@@ -11,7 +11,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.backup.BackupService.BackupDirectorySetting;

astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java

@@ -192,4 +192,4 @@ public class MetadataDaoTests extends DatabaseTestCase {
         cursor.close();
     }
 
-}
+}

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

@@ -10,7 +10,7 @@ import java.util.Date;
 import android.app.Notification;
 import android.content.Intent;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.NotificationManager;
 import com.todoroo.andlib.utility.DateUtilities;

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

@@ -16,7 +16,7 @@ import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
 import com.google.ical.values.WeekdayNum;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Query;

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

@@ -12,7 +12,7 @@ import java.util.Date;
 
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;

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

@@ -11,7 +11,7 @@ import java.util.Locale;
 
 import android.content.res.Resources;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.test.TranslationTests;
 
 public class AstridTranslationTests extends TranslationTests {

astrid/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.astrid"
+          package="org.tasks"
           android:versionName="4.6.8"
           android:versionCode="316">
           
@@ -45,26 +45,26 @@
   <!-- ============================================== Exported Permissions = -->
 
   <!-- for v2 tasks provider -->
-  <permission android:name="org.astrid.permission.READ_TASKS"
+  <permission android:name="org.tasks.permission.READ_TASKS"
               android:permissionGroup="android.permission-group.MESSAGES"
               android:protectionLevel="normal"
               android:label="@string/read_permission_label"
               android:description="@string/read_permission_desc"/>
-  <uses-permission android:name="org.astrid.permission.READ_TASKS"/>
+  <uses-permission android:name="org.tasks.permission.READ_TASKS"/>
   
   <!-- for reading data from add-ons or astrid via v3 content provider -->
-  <permission android:name="org.astrid.READ"
+  <permission android:name="org.tasks.READ"
               android:description="@string/read_permission_desc"
               android:protectionLevel="normal"
               android:label="@string/read_permission_label" />
-  <uses-permission android:name="org.astrid.READ" />
+  <uses-permission android:name="org.tasks.READ" />
   
   <!-- for writing data to add-ons or astrid via v3 content provider -->
-  <permission android:name="org.astrid.WRITE"
+  <permission android:name="org.tasks.WRITE"
               android:description="@string/write_permission_desc"
               android:protectionLevel="normal"
               android:label="@string/write_permission_label" />
-  <uses-permission android:name="org.astrid.WRITE" />
+  <uses-permission android:name="org.tasks.WRITE" />
 
   <!-- ========================================================== Metadata = -->
 
@@ -180,7 +180,7 @@
     
     <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
       <intent-filter> 
-        <action android:name="org.astrid.IN_APP_NOTIFY"/>
+        <action android:name="org.tasks.IN_APP_NOTIFY"/>
       </intent-filter>
     </receiver>
     
@@ -196,7 +196,7 @@
 
     <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
       <intent-filter>
-        <action android:name="org.astrid.FLUSH_DETAILS" />
+        <action android:name="org.tasks.FLUSH_DETAILS" />
       </intent-filter>
     </receiver>
     
@@ -208,7 +208,7 @@
     
     <receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver">
         <intent-filter>
-            <action android:name="org.astrid.SHOW_REENGAGEMENT"/>
+            <action android:name="org.tasks.SHOW_REENGAGEMENT"/>
         </intent-filter>
     </receiver>
 
@@ -219,37 +219,37 @@
     <!-- ======================================================= Providers = -->
 
     <provider android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
-              android:authorities="org.astrid.tasksprovider"
+              android:authorities="org.tasks.tasksprovider"
               android:multiprocess="true"
               android:grantUriPermissions="true"
-              android:readPermission="org.astrid.permission.READ_TASKS"/>
+              android:readPermission="org.tasks.permission.READ_TASKS"/>
 
     <provider android:name="com.todoroo.astrid.provider.Astrid3ContentProvider"
-              android:authorities="org.astrid"
+              android:authorities="org.tasks"
               android:multiprocess="true"
               android:grantUriPermissions="true"
-              android:readPermission="org.astrid.READ"
-              android:writePermission="org.astrid.WRITE"/>
+              android:readPermission="org.tasks.READ"
+              android:writePermission="org.tasks.WRITE"/>
 
     <provider android:name="com.todoroo.astrid.provider.SqlContentProvider"
-              android:authorities="org.astrid.private"
+              android:authorities="org.tasks.private"
               android:multiprocess="true"
               android:grantUriPermissions="true"
-              android:readPermission="org.astrid.READ"
-              android:writePermission="org.astrid.WRITE"/>
+              android:readPermission="org.tasks.READ"
+              android:writePermission="org.tasks.WRITE"/>
 
     <!-- ========================================================= Plugins = -->
         
     <!-- core -->
     <receiver android:name="com.todoroo.astrid.core.CorePlugin">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_ADDONS" />
+        <action android:name="org.tasks.REQUEST_ADDONS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
     <receiver android:name="com.todoroo.astrid.core.CoreFilterExposer">
       <intent-filter android:priority="9000">
-        <action android:name="org.astrid.REQUEST_FILTERS" />
+        <action android:name="org.tasks.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -259,7 +259,7 @@
       <meta-data android:name="summary"
                  android:resource="@string/EPr_defaults_summary" />
       <intent-filter>
-        <action android:name="org.astrid.SETTINGS" />
+        <action android:name="org.tasks.SETTINGS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
@@ -274,25 +274,25 @@
     <!-- tags -->
     <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_ADDONS" />
+        <action android:name="org.tasks.REQUEST_ADDONS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
     <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_FILTERS" />
+        <action android:name="org.tasks.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
     <receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
+        <action android:name="org.tasks.REQUEST_CUSTOM_FILTER_CRITERIA" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
     <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_DETAILS" />
+        <action android:name="org.tasks.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver> 
@@ -300,7 +300,7 @@
     <!-- custom filters -->
     <receiver android:name="com.todoroo.astrid.core.CustomFilterExposer">
       <intent-filter android:priority="9000">
-        <action android:name="org.astrid.REQUEST_FILTERS" />
+        <action android:name="org.tasks.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -312,7 +312,7 @@
     <!-- People view -->
     <receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer">
         <intent-filter>
-            <action android:name="org.astrid.REQUEST_PEOPLE_FILTERS"/>
+            <action android:name="org.tasks.REQUEST_PEOPLE_FILTERS"/>
             <category android:name="android.intent.category.DEFAULT"/>
         </intent-filter>
     </receiver>
@@ -321,7 +321,7 @@
     <!-- Featured lists -->
     <receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer">
         <intent-filter>
-            <action android:name="org.astrid.REQUEST_FEATURED_LISTS"/>
+            <action android:name="org.tasks.REQUEST_FEATURED_LISTS"/>
             <category android:name="android.intent.category.DEFAULT"/>
         </intent-filter>
     </receiver>
@@ -331,13 +331,13 @@
     <!-- alarms -->
     <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
       <intent-filter>
-        <action android:name="org.astrid.TASK_REPEATED" />
+        <action android:name="org.tasks.TASK_REPEATED" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
     <receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_DETAILS" />
+        <action android:name="org.tasks.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
@@ -383,13 +383,13 @@
               android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden"/>
     <receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
+        <action android:name="org.tasks.REQUEST_CUSTOM_FILTER_CRITERIA" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
     <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_FILTERS" />
+        <action android:name="org.tasks.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -397,7 +397,7 @@
               android:theme="@android:style/Theme.Dialog"/>
     <receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_DETAILS" />
+        <action android:name="org.tasks.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -410,13 +410,13 @@
       <meta-data android:name="syncAction"
                  android:value="true" />
       <intent-filter>   
-        <action android:name="org.astrid.SETTINGS" />
+        <action android:name="org.tasks.SETTINGS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
     <service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService">
       <intent-filter>
-        <action android:name="org.astrid.gtasks.SYNC" />
+        <action android:name="org.tasks.gtasks.SYNC" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </service>        
@@ -430,19 +430,19 @@
     <!-- repeats -->
     <receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_ADDONS" />
+        <action android:name="org.tasks.REQUEST_ADDONS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
     <receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener">
       <intent-filter android:priority="1">
-        <action android:name="org.astrid.TASK_COMPLETED" />
+        <action android:name="org.tasks.TASK_COMPLETED" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
     <receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_DETAILS" />
+        <action android:name="org.tasks.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
@@ -450,7 +450,7 @@
     <!-- calendar -->
     <receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener">
       <intent-filter android:priority="2">
-        <action android:name="org.astrid.TASK_COMPLETED" />
+        <action android:name="org.tasks.TASK_COMPLETED" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -461,7 +461,7 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
       <intent-filter>
-          <action android:name="org.astrid.SCHEDULE_CAL_REMINDERS"/>
+          <action android:name="org.tasks.SCHEDULE_CAL_REMINDERS"/>
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -483,7 +483,7 @@
       <meta-data android:name="category"
                  android:resource="@string/SyP_label" />
       <intent-filter>
-        <action android:name="org.astrid.SETTINGS" />
+        <action android:name="org.tasks.SETTINGS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
@@ -498,7 +498,7 @@
       <meta-data android:name="category"
                  android:resource="@string/SyP_label" />
       <intent-filter>
-        <action android:name="org.astrid.SETTINGS" />
+        <action android:name="org.tasks.SETTINGS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
@@ -535,20 +535,20 @@
     <!-- notes -->
     <receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_DETAILS" />
+        <action android:name="org.tasks.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
 
     <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
       <intent-filter android:priority="10000">
-        <action android:name="org.astrid.REQUEST_FILTERS" />
+        <action android:name="org.tasks.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
     <receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
       <intent-filter>
-        <action android:name="org.astrid.TASK_COMPLETED" />
+        <action android:name="org.tasks.TASK_COMPLETED" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
@@ -560,7 +560,7 @@
       <meta-data android:name="summary"
                  android:resource="@string/rmd_EPr_alerts_summary" />
       <intent-filter>
-        <action android:name="org.astrid.SETTINGS" />
+        <action android:name="org.tasks.SETTINGS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
@@ -580,7 +580,7 @@
     <!-- other task actions -->
     <receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
       <intent-filter>
-        <action android:name="org.astrid.REQUEST_ACTIONS" />
+        <action android:name="org.tasks.REQUEST_ACTIONS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>

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

@@ -33,7 +33,7 @@ import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.ui.ErrorCatchingListView;
 

astrid/src/main/java/com/timsu/astrid/data/enums/Importance.java

@@ -5,7 +5,7 @@
  */
 package com.timsu.astrid.data.enums;
 
-import org.astrid.R;
+import org.tasks.R;
 
 public enum Importance {
     // MOST IMPORTANT

astrid/src/main/java/com/timsu/astrid/data/task/AbstractTaskModel.java

@@ -14,7 +14,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.enums.Importance;

astrid/src/main/java/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java

@@ -23,7 +23,7 @@ import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.timsu.astrid.data.alerts.AlertController;
 import com.timsu.astrid.data.sync.SyncDataController;
 import com.timsu.astrid.data.sync.SyncMapping;

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

@@ -22,7 +22,7 @@ import android.provider.MediaStore;
 import android.support.v4.app.Fragment;
 import android.widget.ArrayAdapter;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 

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

@@ -27,7 +27,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
 

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

@@ -9,7 +9,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.service.ThemeService;

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

@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -24,7 +19,6 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -40,7 +34,6 @@ import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
@@ -57,6 +50,12 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.helper.AsyncImageView;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.tasks.R;
+
+import java.util.List;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 public abstract class CommentsFragment extends SherlockListFragment {
@@ -260,22 +259,11 @@ public abstract class CommentsFragment extends SherlockListFragment {
             populateListHeader(listHeader);
         }
 
-        View activityContainer = view.findViewById(R.id.no_activity_container);
-        if (cursor.getCount() == 0) {
-            activityContainer.setVisibility(View.VISIBLE);
-            TextView textView = (TextView)activityContainer.findViewById(R.id.no_activity_message);
-            textView.setText(activity.getString(R.string.ENA_no_comments));
-            listView.setVisibility(View.GONE);
-        }
-        else {
-            activityContainer.setVisibility(View.GONE);
-            listView.setVisibility(View.VISIBLE);
-        }
+        listView.setVisibility(View.VISIBLE);
 
         if (activity instanceof CommentsActivity) {
             setLastViewed();
         }
-
     }
 
     private void addFooterToListView(ListView listView) {

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

@@ -15,7 +15,7 @@ import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;

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

@@ -34,7 +34,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;

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

@@ -34,7 +34,7 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;

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

@@ -5,7 +5,7 @@ import android.database.Cursor;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread;

astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmInvoker.java

@@ -23,7 +23,7 @@ import org.json.JSONObject;
 
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;

astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java

@@ -10,7 +10,7 @@ import org.json.JSONObject;
 
 import android.text.TextUtils;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;

astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java

@@ -25,7 +25,7 @@ import android.net.NetworkInfo;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;

astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java

@@ -11,7 +11,7 @@ import org.json.JSONObject;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.StringProperty;

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

@@ -23,7 +23,7 @@ import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 
 /**
  * Displays an About dialog.

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

@@ -21,7 +21,7 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.Tab;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.adapter.AddOnAdapter;

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

@@ -20,7 +20,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;

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

@@ -22,7 +22,7 @@ import com.commonsware.cwac.tlv.TouchListView;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
 import com.todoroo.andlib.utility.Preferences;
 
-import org.astrid.R;
+import org.tasks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -2,7 +2,7 @@ package com.todoroo.astrid.activity;
 
 import android.content.Context;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CoreFilterExposer;

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

@@ -27,7 +27,7 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;

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

@@ -20,7 +20,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;

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

@@ -41,7 +41,6 @@ import android.widget.Toast;
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
@@ -56,6 +55,8 @@ import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TagsPlugin;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import org.tasks.R;
+
 /**
  * Activity that displays a user's task lists and allows users
  * to filter their task list.
@@ -355,7 +356,7 @@ public class FilterListFragment extends SherlockListFragment {
         DisplayMetrics metrics = new DisplayMetrics();
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
         Bitmap bitmap = ((BitmapDrawable) activity.getResources().getDrawable(
-                R.drawable.icon_blank)).getBitmap();
+                R.drawable.icon)).getBitmap();
         bitmap = bitmap.copy(bitmap.getConfig(), true);
         Canvas canvas = new Canvas(bitmap);
         int dimension = 22;

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

@@ -13,7 +13,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;

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

@@ -14,7 +14,7 @@ import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;

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

@@ -13,7 +13,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.astrid.core.SortHelper;
 
 /**

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

@@ -11,7 +11,7 @@ import android.view.KeyEvent;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;

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

@@ -97,7 +97,7 @@ import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
 import com.todoroo.astrid.voice.VoiceRecognizer;
 
-import org.astrid.R;
+import org.tasks.R;
 
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -11,7 +11,7 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import org.astrid.R;
+import org.tasks.R;
 
 import java.util.ArrayList;
 

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

@@ -33,7 +33,7 @@ import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.QueryTemplate;

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

@@ -51,7 +51,7 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;

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

@@ -23,7 +23,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.astrid.data.AddOn;
 import com.todoroo.astrid.utility.Constants;
 

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

@@ -40,7 +40,7 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;

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

@@ -55,7 +55,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.LongProperty;

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

@@ -42,7 +42,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.CursorAdapter;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;

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

@@ -16,7 +16,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Metadata;

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

@@ -11,7 +11,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.utility.Flags;
 

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

@@ -16,7 +16,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.view.View;
 import android.view.ViewGroup.OnHierarchyChangeListener;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;

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

@@ -18,7 +18,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;

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

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
 public class FilePickerBuilder extends AlertDialog.Builder implements DialogInterface.OnClickListener {

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

@@ -19,7 +19,7 @@ import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.PropertyVisitor;

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

@@ -28,7 +28,7 @@ import android.util.Log;
 import android.view.WindowManager.BadTokenException;
 
 import com.google.ical.values.RRule;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.PropertyVisitor;

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

@@ -24,7 +24,7 @@ import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;

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

@@ -18,7 +18,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;

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

@@ -16,7 +16,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Join;

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

@@ -36,7 +36,7 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;

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

@@ -22,7 +22,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.astrid.api.MultipleSelectCriterion;
 import com.todoroo.astrid.api.TextInputCriterion;
 import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;

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

@@ -16,7 +16,7 @@ import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;

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

@@ -11,7 +11,7 @@ import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;

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

@@ -21,7 +21,7 @@ import android.text.Spannable;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.api.TaskDecoration;

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

@@ -14,7 +14,7 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;

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

@@ -10,7 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteConstraintException;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;

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

@@ -17,7 +17,7 @@ import android.view.View.OnClickListener;
 import android.widget.Chronometer;
 import android.widget.Toast;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.aacenc.AACRecorder;
 import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks;
 import com.todoroo.aacenc.AACToM4A;

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

@@ -25,7 +25,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 
 /**

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

@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import android.content.Context;
 import android.text.TextUtils;
 
-import org.astrid.R;
+import org.tasks.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.TaskAttachment;