Updated what's in the power pack

astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java

@@ -33,9 +33,6 @@ public class TimerActionExposer extends BroadcastReceiver {
         if(taskId == -1)
             return;
 
-        if(!PluginServices.getAddOnService().hasPowerPack())
-            return;
-
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TIMER_START,
                 Task.ELAPSED_SECONDS);
 

astrid/res/xml/preferences.xml

@@ -18,12 +18,13 @@
             android:defaultValue="false" />
     </PreferenceCategory>
 
+    <CheckBoxPreference
+        android:key="@string/p_statistics"
+        android:title="@string/EPr_statistics_title"
+        android:defaultValue="true" />
+        
     <PreferenceCategory
         android:title="@string/EPr_powerpack_header">
-        <CheckBoxPreference
-            android:key="@string/p_statistics"
-            android:title="@string/EPr_statistics_title"
-            android:defaultValue="true" />
         <PreferenceScreen
             android:title="@string/EPr_voice_header">
             

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

@@ -32,10 +32,10 @@ import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnDismissListener;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -48,7 +48,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -63,6 +62,7 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
+import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property.StringProperty;
@@ -285,10 +285,10 @@ public final class TaskEditActivity extends TabActivity {
                             Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$
                         }
 
-                        if(addOnService.hasPowerPack()) {
-                            controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
-                            controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
-                        } else {
+                        controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
+                        controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
+
+                        if(!addOnService.hasPowerPack()) {
                             // show add-on help if necessary
                             View addonsEmpty = findViewById(R.id.addons_empty);
                             addonsEmpty.setVisibility(View.VISIBLE);

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

@@ -742,7 +742,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 return;
 
             // hack because we know we have > 1 button
-            if(addOnService.hasPowerPack() && actions.size() == 0)
+            if(actions.size() == 0)
                 return;
 
             for(int i = viewHolder.actions.getChildCount(); i < actions.size() + 1; i++) {