Updated some strings, A/B test presence of notifications

astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementFragment.java

@@ -19,21 +19,29 @@ public class ReengagementFragment extends DisposableTaskListFragment {
 
         Resources r = getActivity().getResources();
 
-        int color = r.getColor(ThemeService.getThemeColor());
+        super.initializeData();
 
-        View snooze = getView().findViewById(R.id.reminder_snooze);
+        TextView snooze = (TextView) getView().findViewById(R.id.reminder_snooze);
-        snooze.setBackgroundColor(color);
+        snooze.setBackgroundColor(r.getColor(ThemeService.getThemeColor()));
+        TextView reminder = (TextView) getView().findViewById(R.id.reminder_message);
+        if (taskAdapter.getCount() == 0) {
+            reminder.setText(Notifications.getRandomReminder(r.getStringArray(R.array.rmd_reengage_dialog_empty_options)));
+            snooze.setText(R.string.rmd_reengage_add_tasks);
             snooze.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                getActivity().finish();
+                    quickAddBar.performButtonClick();
                 }
             });
-
+        } else {
-        TextView reminder = (TextView) getView().findViewById(R.id.reminder_message);
             reminder.setText(Notifications.getRandomReminder(r.getStringArray(R.array.rmd_reengage_dialog_options)));
-
+            snooze.setOnClickListener(new OnClickListener() {
-        super.initializeData();
+                @Override
+                public void onClick(View v) {
+                    getActivity().finish();
+                }
+            });
+        }
     }
 
     @Override

astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java

@@ -18,6 +18,8 @@ import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 import com.todoroo.astrid.utility.Constants;
 
 public class ReengagementReceiver extends BroadcastReceiver {
@@ -26,6 +28,8 @@ public class ReengagementReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (ABChooser.readChoiceForTest(ABTests.AB_TEST_REENGAGEMENT_ENABLED) == 0)
+            return;
 
         int reengagementReminders = Preferences.getInt(ReengagementService.PREF_REENGAGEMENT_COUNT, 1);
         Preferences.setInt(ReengagementService.PREF_REENGAGEMENT_COUNT, reengagementReminders + 1);

astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementService.java

@@ -1,5 +1,7 @@
 package com.todoroo.astrid.reminders;
 
+import java.util.Date;
+
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -13,6 +15,8 @@ public final class ReengagementService {
 
     private static final int REQUEST_CODE = 10;
 
+    private static final int DAYS_INTERVAL = 2;
+
     public static final String PREF_REENGAGEMENT_COUNT = "pref_reengagement_count"; //$NON-NLS-1$
 
     public static final String BROADCAST_SHOW_REENGAGEMENT = Constants.PACKAGE + ".SHOW_REENGAGEMENT"; //$NON-NLS-1$
@@ -31,11 +35,16 @@ public final class ReengagementService {
         int reengagementReminders = Preferences.getInt(PREF_REENGAGEMENT_COUNT, 1);
         int days;
         if (reengagementReminders >= 4)
-            days = 8;
+            days = DAYS_INTERVAL * 4;
         else
-            days = 2 * reengagementReminders;
+            days = DAYS_INTERVAL * reengagementReminders;
+
+        Date date = new Date(DateUtilities.now() + DateUtilities.ONE_DAY * days / 1000L * 1000L);
+        date.setHours(18);
+        date.setMinutes(0);
+        date.setSeconds(0);
 
-        return DateUtilities.now() + DateUtilities.ONE_DAY * days;
+        return date.getTime();
     }
 
 }

astrid/res/values/strings-reminders.xml

@@ -66,10 +66,15 @@
   
   <string name="rmd_reengage_snooze">Snooze all</string>
   
+  <string name="rmd_reengage_add_tasks">Add a task</string>
+  
   <string-array name="rmd_reengage_dialog_options">
       <item>Time to shorten your to-do list!</item>
   </string-array>
   
+  <string-array name="rmd_reengage_dialog_empty_options">
+      <item>Don\'t you want to get organized?</item>
+  </string-array>
   <!-- ============================================= reminder preferences == -->
   
   <!-- Reminder Preference Screen Title -->

astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java

@@ -115,11 +115,14 @@ public class ABTests {
     }
 
     private void initialize() { // Set up
-
         addTest(AB_TEST_PRODUCTEEV_ENABLED, new int[] { 1, 1 },
                 new int[] { 1, 0 }, new String[] { "producteev-disabled", "producteev-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$
+
+        addTest(AB_TEST_REENGAGEMENT_ENABLED, new int[] { 1, 9 },
+                new int[] { 1, 9 }, new String[] { "reengagement-disabled", "reengagement-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public static final String AB_TEST_PRODUCTEEV_ENABLED = "producteev";  //$NON-NLS-1$
+    public static final String AB_TEST_REENGAGEMENT_ENABLED = "reengagement"; ////$NON-NLS-1$
 
 }