diff --git a/astrid/build.xml b/astrid/build.xml
index 62bbb8a6a..5a53210d5 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -34,7 +34,6 @@
should be checked in in Version Control Systems. -->
-
@@ -111,7 +110,7 @@
-
+
@@ -140,6 +139,15 @@
+
+
+
+
+
+
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index c4c3a4100..7b75c6846 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -92,6 +92,7 @@ import com.todoroo.astrid.timers.TimerControlSet;
import com.todoroo.astrid.ui.CalendarDialog;
import com.todoroo.astrid.ui.DeadlineTimePickerDialog;
import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
+import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.voice.VoiceInputAssistant;
/**
@@ -300,7 +301,7 @@ public final class TaskEditActivity extends TabActivity {
controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
- if(!addOnService.hasPowerPack()) {
+ if(!Constants.MARKET_DISABLED && !addOnService.hasPowerPack()) {
// show add-on help if necessary
View addonsEmpty = findViewById(R.id.addons_empty);
addonsEmpty.setVisibility(View.VISIBLE);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 1e4d225b7..fdb12c492 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -250,9 +250,11 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
MenuItem item;
- item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
- R.string.TLA_menu_addons);
- item.setIcon(android.R.drawable.ic_menu_set_as);
+ if(!Constants.MARKET_DISABLED) {
+ item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
+ R.string.TLA_menu_addons);
+ item.setIcon(android.R.drawable.ic_menu_set_as);
+ }
item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE,
R.string.TLA_menu_settings);
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index 4b0852128..b41c3941a 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -20,6 +20,11 @@ public final class Constants {
*/
public static final boolean OEM = false;
+ /**
+ * Whether this is an Android Market-disabled build
+ */
+ public static final boolean MARKET_DISABLED = false;
+
/**
* Interval to update the widget (in order to detect hidden tasks
* becoming visible)
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
index 37285d69d..65bb11879 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
@@ -217,7 +217,7 @@ public class VoiceInputAssistant {
else
packageName = "com.google.android.voicesearch";
- // User wants to install voice search, take him to the market
+ // User wants to install voice search, take them to the market
Intent marketIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse("market://search?q=pname:" + packageName)); //$NON-NLS-1$
try {
diff --git a/build.xml b/build.xml
index d5f2f2823..d9dfe3198 100644
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@
-
+
@@ -39,6 +39,13 @@
+
+
+
+
+
+
+