diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 71c041b02..eafe4c02a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -43,7 +43,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; -import android.widget.Toast; import com.commonsware.cwac.merge.MergeAdapter; import com.timsu.astrid.R; @@ -796,7 +795,6 @@ public class EditPeopleControlSet extends PopupControlSet { activity.getString(R.string.actfm_EPA_login_to_share), R.string.actfm_EPA_login_button, R.string.actfm_EPA_dont_share_button, android.R.drawable.ic_dialog_alert, okListener, cancelListener); - showSaveToast(toast); return false; } @@ -811,8 +809,6 @@ public class EditPeopleControlSet extends PopupControlSet { else if (task.getValue(Task.USER_ID) != Task.USER_ID_SELF) StatisticsService.reportEvent(StatisticsConstants.TASK_ASSIGNED_PICKER); - showSaveToast(toast); - return true; } catch (JSONException e) { exceptionService.displayAndReportError(activity, "save-people", e); @@ -832,14 +828,6 @@ public class EditPeopleControlSet extends PopupControlSet { assignToMe(); } - private void showSaveToast(String saveToast) { - if(saveToast == null || !Preferences.getBoolean(R.string.p_showEditToasts, false)) - return; - int length = saveToast.contains("\n") ? //$NON-NLS-1$ - Toast.LENGTH_LONG : Toast.LENGTH_SHORT; - Toast.makeText(activity, saveToast, length).show(); - } - @SuppressWarnings("nls") protected Object[] buildSharingArgs(JSONArray emails) throws JSONException { ArrayList values = new ArrayList(); diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 4ce230cd9..36459b128 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -70,9 +70,6 @@ account - - show_edit_toasts - 1 diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index 26158635d..c29c03aaf 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -93,11 +93,6 @@ android:key="@string/p_show_featured_lists_labs" android:defaultValue="false"/> - - diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 42a004ffd..a01cb574f 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -995,19 +995,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } removeExtrasFromIntent(getActivity().getIntent()); - showCancelToast(); getActivity().onBackPressed(); } - /** - * Show toast for task edit canceling - */ - private void showCancelToast() { - if (Preferences.getBoolean(R.string.p_showEditToasts, false)) - Toast.makeText(getActivity(), R.string.TEA_onTaskCancel, - Toast.LENGTH_SHORT).show(); - } - protected void deleteButtonClick() { new AlertDialog.Builder(getActivity()).setTitle( R.string.DLG_confirm_title).setMessage( @@ -1018,7 +1008,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { taskService.delete(model); TimerPlugin.updateTimer(getActivity(), model, false); shouldSaveState = false; - showDeleteToast(); Activity a = getActivity(); if (a instanceof TaskEditActivity) { @@ -1034,15 +1023,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { }).setNegativeButton(android.R.string.cancel, null).show(); } - /** - * Show toast for task edit deleting - */ - private void showDeleteToast() { - if (Preferences.getBoolean(R.string.p_showEditToasts, false)) - Toast.makeText(getActivity(), R.string.TEA_onTaskDelete, - Toast.LENGTH_SHORT).show(); - } - private void startAttachFile() { ArrayList options = new ArrayList(); options.add(getString(R.string.file_add_picture)); diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java index b819d20b4..e5a7f69cf 100644 --- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java +++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java @@ -119,8 +119,6 @@ public class ABTests { bundles.put(testKey, bundle); } - public static final String AB_TASK_EDIT_TOAST = "android_task_edit_toast"; //$NON-NLS-1$ - public static final String AB_SWIPE_BETWEEN = "android_swipe_v3"; //$NON-NLS-1$ public static final String AB_SIMPLE_TASK_ROW = "android_simple_task_row"; //$NON-NLS-1$ @@ -128,8 +126,6 @@ public class ABTests { public static final String AB_ADVANCED_EDIT = "android_advanced_edit"; //$NON-NLS-1$ private void initialize() { - addTest(AB_TASK_EDIT_TOAST, new int[] { 1, 1 }, - new int[] { 1, 1 }, new String[] { "dont-show-toasts", "show-toasts" }); //$NON-NLS-1$ //$NON-NLS-2$ addTest(AB_SIMPLE_TASK_ROW, new int[] { 1, 1 }, new int[] { 1, 0 }, new String[] { "original-row-style", "simple-row-style" });//$NON-NLS-1$ //$NON-NLS-2$ diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index 3a9cc42e3..4290b388a 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -72,9 +72,6 @@ public class AstridPreferences { Preferences.setIfUnset(prefs, editor, r, R.string.p_ideas_tab_enabled, true); - Preferences.setIfUnset(prefs, editor, r, R.string.p_showEditToasts, - ABChooser.readChoiceForTest(ABTests.AB_TASK_EDIT_TOAST) != 0); - Preferences.setIfUnset(prefs, editor, r, R.string.p_taskRowStyle, ABChooser.readChoiceForTest(ABTests.AB_SIMPLE_TASK_ROW) != 0);