Moved gcal to standard Astrid, added message to end of task edit page

astrid/res/layout/task_edit_activity.xml

@@ -245,9 +245,7 @@
       <LinearLayout android:id="@+id/tab_addons_addons"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="vertical" />
+        android:orientation="vertical">
-        
-    </ScrollView>
         
         <LinearLayout android:id="@+id/addons_empty"
           android:layout_width="fill_parent"
@@ -266,7 +264,7 @@
           <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:text="@string/TEA_no_addons"
+            android:text="@string/TEA_addons_text"
             android:padding="10dip"
             android:gravity="center"
             style="@style/TextAppearance.TLA_NoItems" />
@@ -279,6 +277,10 @@
         
         </LinearLayout>
         
+      </LinearLayout>
+        
+    </ScrollView>
+        
     <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"

astrid/res/values/strings-core.xml

@@ -286,10 +286,10 @@
   </string-array>
   
   <!-- Add Ons tab when no add-ons found -->
-  <string name="TEA_no_addons">No Add-ons Found!</string>
+  <string name="TEA_addons_text">Looking for more features?</string>
   
   <!-- Add Ons button -->
-  <string name="TEA_addons_button">Get Some Add-ons</string>
+  <string name="TEA_addons_button">Get the Power Pack!</string>
   
   <!-- ============================================= IntroductionActivity == -->
   

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

@@ -260,16 +260,16 @@ 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 GCalControlSet(TaskEditActivity.this, addonsAddons));
+                        if(addOnService.hasPowerPack()) {
                             controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
                             controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
-                        }
+                        } else {
-
                             // show add-on help if necessary
-                        if(addonsAddons.getChildCount() == 0) {
+                            View addonsEmpty = findViewById(R.id.addons_empty);
-                            ((View)addonsAddons.getParent()).setVisibility(View.GONE);
+                            addonsEmpty.setVisibility(View.VISIBLE);
-                            findViewById(R.id.addons_empty).setVisibility(View.VISIBLE);
+                            addonsAddons.removeView(addonsEmpty);
+                            addonsAddons.addView(addonsEmpty);
                             ((Button)findViewById(R.id.addons_button)).setOnClickListener(new View.OnClickListener() {
                                 @Override
                                 public void onClick(View v) {