From 183235ef7946fdfdd51df6f99c58f99204d0cdde Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 15 Oct 2012 14:46:11 -0700
Subject: [PATCH] Remove the compress task row preference, instead
 automatically do so if the font size is set to be small

---
 astrid/res/values/keys.xml                                  | 2 --
 astrid/res/xml/preferences.xml                              | 6 ------
 astrid/src/com/todoroo/astrid/activity/EditPreferences.java | 2 --
 astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java      | 2 +-
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 35e4ffbd0..dadb046a6 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -238,8 +238,6 @@
   
   <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
   
-  <string name="p_allowCompressedTaskRows">allowCompressedTaskRows</string>
-  
   <string name="p_taskRowPrefs">taskRowPrefs</string>
   
   <string name="p_fullTaskTitle">fullTaskTitle</string>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index dcc885e83..c29c03aaf 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -46,12 +46,6 @@
 	            android:title="@string/EPr_fullTask_title"
 	            android:defaultValue="false" />
 	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_allowCompressedTaskRows"
-                android:title="@string/EPr_compressTaskRows_title"
-                android:summary="@string/EPr_compressTaskRows_desc"
-                android:defaultValue="false" />
-	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	            android:key="@string/p_showNotes"
 	            android:title="@string/EPr_showNotes_title"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 65895dd4e..48ceda5ae 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -646,8 +646,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
             }
         });
 
-        findPreference(getString(R.string.p_allowCompressedTaskRows)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_THEME_CHANGED));
-
         findPreference(getString(R.string.p_statistics)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 58ea52ca2..6e99ba673 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -393,7 +393,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     public synchronized void setFieldContentsAndVisibility(View view) {
         ViewHolder viewHolder = (ViewHolder)view.getTag();
         Task task = viewHolder.task;
-        if (Preferences.getBoolean(R.string.p_allowCompressedTaskRows, false)) {
+        if (fontSize < 16) {
             viewHolder.rowBody.setMinimumHeight(0);
             viewHolder.completeBox.setMinimumHeight(0);
         } else {