Remove the compress task row preference, instead automatically do so if the font size is set to be small

pull/14/head
Sam Bosley 13 years ago
parent 8f268dfe30
commit 183235ef79

@ -238,8 +238,6 @@
<string name="p_showSmartConfirmation_key">showSmartConfirmation</string> <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
<string name="p_allowCompressedTaskRows">allowCompressedTaskRows</string>
<string name="p_taskRowPrefs">taskRowPrefs</string> <string name="p_taskRowPrefs">taskRowPrefs</string>
<string name="p_fullTaskTitle">fullTaskTitle</string> <string name="p_fullTaskTitle">fullTaskTitle</string>

@ -46,12 +46,6 @@
android:title="@string/EPr_fullTask_title" android:title="@string/EPr_fullTask_title"
android:defaultValue="false" /> 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 <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_showNotes" android:key="@string/p_showNotes"
android:title="@string/EPr_showNotes_title" android:title="@string/EPr_showNotes_title"

@ -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() { findPreference(getString(R.string.p_statistics)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {

@ -393,7 +393,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
public synchronized void setFieldContentsAndVisibility(View view) { public synchronized void setFieldContentsAndVisibility(View view) {
ViewHolder viewHolder = (ViewHolder)view.getTag(); ViewHolder viewHolder = (ViewHolder)view.getTag();
Task task = viewHolder.task; Task task = viewHolder.task;
if (Preferences.getBoolean(R.string.p_allowCompressedTaskRows, false)) { if (fontSize < 16) {
viewHolder.rowBody.setMinimumHeight(0); viewHolder.rowBody.setMinimumHeight(0);
viewHolder.completeBox.setMinimumHeight(0); viewHolder.completeBox.setMinimumHeight(0);
} else { } else {

Loading…
Cancel
Save