diff --git a/astrid/res/layout-large-land/task_edit_wrapper_activity.xml b/astrid/res/layout-large/task_edit_wrapper_activity.xml
similarity index 100%
rename from astrid/res/layout-large-land/task_edit_wrapper_activity.xml
rename to astrid/res/layout-large/task_edit_wrapper_activity.xml
diff --git a/astrid/res/layout-large-land/task_list_wrapper_activity.xml b/astrid/res/layout-large/task_list_wrapper_activity.xml
similarity index 100%
rename from astrid/res/layout-large-land/task_list_wrapper_activity.xml
rename to astrid/res/layout-large/task_list_wrapper_activity.xml
diff --git a/astrid/res/layout-small-land/task_edit_activity.xml b/astrid/res/layout-small-land/task_edit_activity.xml
deleted file mode 100644
index de0207476..000000000
--- a/astrid/res/layout-small-land/task_edit_activity.xml
+++ /dev/null
@@ -1,523 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 6b49ddac9..1c296d031 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -6,44 +6,10 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
style="@style/Content">
-
-
-
-
-
-
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index cc2d12d5e..b0199462c 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -454,24 +454,6 @@ public final class TaskEditActivity extends Fragment {
/** Set up button listeners */
private void setUpListeners() {
- final View.OnClickListener mSaveListener = new View.OnClickListener() {
- public void onClick(View v) {
- saveButtonClick();
- }
- };
- final View.OnClickListener mDiscardListener = new View.OnClickListener() {
- public void onClick(View v) {
- discardButtonClick();
- }
- };
- final View.OnClickListener mExpandWhenListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (whenDialog != null)
- whenDialog.show();
- Preferences.setBoolean(R.string.p_showed_when_row, true);
- }
- };
final View.OnClickListener mExpandMoreListener = new View.OnClickListener() {
final Animation fadeIn = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in);
final Animation fadeOut = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out);
@@ -492,14 +474,7 @@ public final class TaskEditActivity extends Fragment {
// set up save, cancel, and delete buttons
try {
- Button saveButtonGeneral = (Button) getView().findViewById(R.id.save);
- saveButtonGeneral.setOnClickListener(mSaveListener);
-
- Button discardButtonGeneral = (Button) getView().findViewById(R.id.discard);
- discardButtonGeneral.setOnClickListener(mDiscardListener);
-
getView().findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener);
-
} catch (Exception e) {
// error loading the proper activity
}