From b8972304fb49e5739f295e3ac6bb01a783672d8e Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 16 Jan 2012 15:40:11 -0800
Subject: [PATCH] Use two column layout in portrait and landscape for all large
 screens

---
 .../task_edit_wrapper_activity.xml            |   0
 .../task_list_wrapper_activity.xml            |   0
 .../layout-small-land/task_edit_activity.xml  | 523 ------------------
 astrid/res/layout/task_edit_activity.xml      |  34 --
 .../astrid/activity/TaskEditActivity.java     |  25 -
 5 files changed, 582 deletions(-)
 rename astrid/res/{layout-large-land => layout-large}/task_edit_wrapper_activity.xml (100%)
 rename astrid/res/{layout-large-land => layout-large}/task_list_wrapper_activity.xml (100%)
 delete mode 100644 astrid/res/layout-small-land/task_edit_activity.xml

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-  android:id="@+id/taskEditParent"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  style="@style/Content">
-  
-  <View
-    android:layout_width="fill_parent"
-    android:layout_height="2dip"
-    android:background="@color/task_edit_selected" />
-    
-  
-  <!-- ======================================================= tab: basic == -->
-  <ScrollView
-    android:id="@+id/tab_basic"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- title -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_title_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <com.todoroo.astrid.ui.ErrorCatchingEditText
-        android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/TEA_title_hint"
-        android:autoText="true"
-        android:text=""
-        android:capitalize="sentences" 
-        android:freezesText="true"/>
-      <!-- importance -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_importance_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/importance_container"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-      </LinearLayout>
-      <!-- urgency -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_urgency_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Button
-          android:id="@+id/urgency_date"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_date" />
-        <Button
-          android:id="@+id/urgency_time"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_time" />
-      </LinearLayout>
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_urgency"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-      <!-- tags -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_tags_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/tags_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <Spinner
-        android:id="@+id/tags_dropdown"
-        android:paddingBottom="5dip"
-        android:entries="@array/TEA_loading"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- notes -->
-      <TextView
-        android:id="@+id/notes_label"
-        android:paddingTop="5dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_note_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <!-- Voice Add Note Button -->
-        <ImageButton
-          android:id="@+id/voiceAddNoteButton"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_microphone"
-          android:scaleType="fitCenter"
-          android:visibility="gone" />
-        <EditText
-          android:id="@+id/notes"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="100"
-          android:scrollbars="vertical"
-          android:gravity="top"
-          android:hint="@string/TEA_notes_hint"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false"
-          android:freezesText="true" />
-      </LinearLayout>
-        <!-- buttons -->
-	  <LinearLayout android:id="@+id/edit_footer"
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="48dip"
-	    android:layout_marginTop="7dip"
-	    android:layout_alignParentBottom="true"
-	    android:padding="5dip"
-	    android:background="@drawable/footer_background"
-	    android:baselineAligned="false">
-	    <Button
-	      android:id="@+id/save"
-	      android:layout_width="fill_parent"
-	      android:layout_height="fill_parent"
-	      android:layout_marginRight="5dip"
-	      android:background="@drawable/footer_greenbtn"
-	      android:text="@string/DLG_save"
-	      android:textStyle="bold"
-	      style="@style/TextAppearance.TEA_action"
-	      android:layout_weight="1" />
-	    <Button
-	      android:id="@+id/discard"
-	      android:layout_width="fill_parent"
-	      android:layout_height="fill_parent"
-	      android:layout_marginLeft="5dip"
-	      android:background="@drawable/footer_redbtn"
-	      android:text="@android:string/cancel"
-	      style="@style/TextAppearance.TEA_action"
-	      android:layout_weight="1" />
-	  </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ===================================================== tab: sharing == -->
-  <ScrollView
-    android:id="@+id/tab_share"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_assign_label" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Spinner
-          android:id="@+id/assigned_spinner"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:hint="@string/actfm_person_hint" />
-        <com.todoroo.astrid.ui.ContactsAutoComplete
-          android:id="@+id/assigned_custom"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:visibility="gone"
-          android:hint="@string/actfm_person_hint" />
-        <ImageButton
-          android:id="@+id/assigned_clear"
-          style="?android:attr/buttonStyleInset"
-          android:src="@android:drawable/ic_delete"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:layout_marginTop="2dip"
-          android:layout_marginRight="2dip"
-          android:layout_marginBottom="2dip"
-          android:visibility="gone"
-          android:gravity="center_vertical" />
-      </LinearLayout>
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_share_with" />
-      <com.todoroo.astrid.ui.PeopleContainer
-        android:id="@+id/share_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <LinearLayout
-        android:id="@+id/share_additional"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-        <TextView
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="5dip"
-          android:paddingBottom="5dip"
-          android:text="@string/actfm_EPA_message_text" />
-        <EditText
-          android:id="@+id/message"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:scrollbars="vertical"
-          android:text="@string/actfm_EPA_message_body"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false" />
-        <TextView
-          android:id="@+id/tag_label"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingBottom="5dip"
-          android:visibility="gone"
-          android:text="@string/actfm_EPA_tag_label" />
-        <EditText
-          android:id="@+id/tag_name"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:visibility="gone"
-          android:hint="@string/actfm_EPA_tag_hint" />
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-      </LinearLayout>
-      <LinearLayout
-        android:id="@+id/collaborators"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_facebook"
-        android:text="@string/actfm_EPA_facebook"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_twitter"
-        android:text="@string/actfm_EPA_twitter"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_margin="15dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="15dip"
-        android:text="@string/actfm_EPA_intro"
-        android:gravity="center"
-        android:textColor="#ee9900" />
-	    <LinearLayout android:id="@+id/edit_footer2"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save2"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard2"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-
-  <!-- ====================================================== tab: alarms == -->
-  <ScrollView
-    android:id="@+id/tab_alarms"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- reminders -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_due"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_due" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_overdue"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_overdue" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-        <CheckBox
-          style="@style/TextAppearance.GEN_EditLabel"   
-          android:id="@+id/reminder_random"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="5dip"
-          android:button="@drawable/btn_check_small"       
-          android:text="@string/TEA_reminder_random" />
-        <Spinner
-          android:id="@+id/reminder_random_interval"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-      </LinearLayout>
-      <!-- reminder mode -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_alarm_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/reminder_alarm"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_alarms"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-	    <LinearLayout android:id="@+id/edit_footer3"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save3"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard3"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ======================================================= tab: more == -->
-  <ScrollView
-    android:id="@+id/tab_more"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- hide until -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_hideUntil_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/hideUntil"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_more"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <LinearLayout
-          android:id="@+id/addons_empty"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
-          android:layout_weight="100"
-          android:gravity="center"
-          android:visibility="gone"
-          android:orientation="vertical">
-          <ImageView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dip"
-            android:src="@drawable/icon_pp" />
-          <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/TEA_addons_text"
-            android:padding="10dip"
-            android:gravity="center"
-            style="@style/TextAppearance.TLA_NoItems" />
-          <Button
-            android:id="@+id/addons_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dip"
-            android:text="@string/TEA_addons_button" />
-        </LinearLayout>
-      </LinearLayout>
-	    <LinearLayout android:id="@+id/edit_footer4"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save4"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard4"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-
-
-</RelativeLayout>
\ 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">
-  
-    <!-- buttons -->
-	<LinearLayout android:id="@+id/edit_footer"
-	  android:orientation="horizontal"
-	  android:layout_width="fill_parent"
-	  android:layout_height="50dip"
-	  android:layout_alignParentBottom="true"
-	  android:padding="5dip"
-	  android:background="@drawable/footer_background"
-	  android:baselineAligned="false">
-	  <Button
-	    android:id="@+id/save"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginRight="5dip"
-	    android:background="@drawable/footer_editbutton"
-	    android:gravity="center"
-	    android:text="@string/DLG_save"
-	    android:textStyle="bold"
-	    style="@style/TextAppearance.TEA_action"
-	    android:layout_weight="1" />
-	  <Button
-	    android:id="@+id/discard"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginLeft="5dip"
-	    android:background="@drawable/footer_editbutton"
-	    android:gravity="center"
-	    android:text="@android:string/cancel"
-	    style="@style/TextAppearance.TEA_action"
-	    android:textColor="#000000"
-	    android:layout_weight="1" />
-	</LinearLayout>
         
 	<ScrollView
 	  android:id="@+id/edit_scroll"
 	  android:layout_alignParentTop="true"
-	  android:layout_above="@id/edit_footer"
 	  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
         }