From 0496b2d185679ad6de829b82423bf5034c017ae9 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 26 Sep 2013 12:09:13 -0500
Subject: [PATCH] Remove 'Customize' from task edit screen

---
 .../astrid/activity/TaskEditFragment.java     | 22 -------------------
 .../main/res/layout/task_edit_activity.xml    | 12 ++--------
 astrid/src/main/res/values/strings-core.xml   |  2 --
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 1d126bb2e..fcf7a675a 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -518,8 +518,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
-        setupBeastModeButton();
-
         getView().findViewById(R.id.delete_task).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -533,26 +531,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         new TaskEditBackgroundLoader().start();
     }
 
-    private void setupBeastModeButton() {
-        TextView beastMode = (TextView) getView().findViewById(R.id.edit_beast_mode);
-        TypedValue tv = new TypedValue();
-        Theme theme = getActivity().getTheme();
-        theme.resolveAttribute(R.attr.asTextColor, tv, false);
-
-        int color = tv.data & 0x00ffffff;
-        color = color + 0x7f000000;
-        beastMode.setTextColor(color);
-
-        beastMode.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), BeastModePreferences.class);
-                intent.setAction(AstridApiConstants.ACTION_SETTINGS);
-                startActivityForResult(intent, REQUEST_CODE_BEAST_MODE);
-            }
-        });
-    }
-
     private void loadEditPageOrder(boolean removeViews) {
         LinearLayout basicControls = (LinearLayout) getView().findViewById(
                 R.id.basic_controls);
diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml
index 79a91e439..c6f99524d 100644
--- a/astrid/src/main/res/layout/task_edit_activity.xml
+++ b/astrid/src/main/res/layout/task_edit_activity.xml
@@ -71,20 +71,12 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
-            
-            <TextView
-                android:id="@+id/edit_beast_mode"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="17dip"
-                android:paddingBottom="17dip"
-                android:text="@string/EPr_beastMode_shortcut"
-                android:textColor="?attr/asTextColor"/>
-            
+
             <ImageView
                 android:id="@+id/delete_task"
                 android:layout_width="20dip"
                 android:layout_height="20dip"
+                android:layout_marginTop="10dip"
                 android:layout_marginBottom="10dip"
                 android:src="@drawable/trashcan"
                 android:scaleType="fitCenter"/>
diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml
index 21985ac10..2d133afaa 100644
--- a/astrid/src/main/res/values/strings-core.xml
+++ b/astrid/src/main/res/values/strings-core.xml
@@ -588,8 +588,6 @@
   <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
   <string name="EPr_beastMode_title">Edit screen order</string>
   
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
   <string name="EPr_time_increment">5 minute increments</string>
   
   <string name="EPr_use_date_shortcuts">Use date shortcuts</string>