diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml index 1b61480cd..3cab8c328 100644 --- a/astrid/res/layout/task_adapter_row.xml +++ b/astrid/res/layout/task_adapter_row.xml @@ -12,13 +12,6 @@ android:background="?attr/asTaskRowSelector" android:orientation="horizontal"> - - showSmartConfirmation - legacyImportanceStyle - taskRowPrefs fullTaskTitle diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index c32923736..f0e79d11e 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -46,12 +46,6 @@ android:key="@string/p_showNotes" android:title="@string/EPr_showNotes_title" android:defaultValue="false" /> - - diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 82739c055..121a4bfbe 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -290,7 +290,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.task = new Task(); viewHolder.view = view; viewHolder.rowBody = (ViewGroup)view.findViewById(R.id.rowBody); - viewHolder.importance = view.findViewById(R.id.importance_legacy); viewHolder.nameView = (TextView)view.findViewById(R.id.title); viewHolder.picture = (AsyncImageView)view.findViewById(R.id.picture); viewHolder.pictureBorder = (ImageView)view.findViewById(R.id.pictureBorder); @@ -361,7 +360,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { public ViewGroup view; public ViewGroup rowBody; public TextView nameView; - public View importance; // for legacy importance style public CheckableImageView completeBox; public AsyncImageView picture; public ImageView pictureBorder; @@ -463,28 +461,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable { // importance bar final CheckableImageView checkBoxView = viewHolder.completeBox; { - // Logic for legacy style - boolean useLegacyImportance = Preferences.getBoolean(R.string.p_useLegacyImportanceStyle, false); - if (useLegacyImportance) { - viewHolder.importance.setVisibility(View.VISIBLE); - } else { - viewHolder.importance.setVisibility(View.GONE); - } int value = task.getValue(Task.IMPORTANCE); if (value >= IMPORTANCE_RESOURCES.length) value = IMPORTANCE_RESOURCES.length - 1; - if (useLegacyImportance) { - checkBoxView.setImageResource(R.drawable.btn_check); - viewHolder.importance.setBackgroundResource(LEGACY_IMPORTANCE_RESOURCES[value]); - } else if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) { + if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) { checkBoxView.setImageResource(IMPORTANCE_REPEAT_RESOURCES[value]); } else { checkBoxView.setImageResource(IMPORTANCE_RESOURCES[value]); } if (pictureView != null && pictureView.getVisibility() == View.VISIBLE) { checkBoxView.setVisibility(View.INVISIBLE); - if (viewHolder.pictureBorder != null && !useLegacyImportance) + if (viewHolder.pictureBorder != null) viewHolder.pictureBorder.setBackgroundResource(IMPORTANCE_RESOURCES_LARGE[value]); } else { checkBoxView.setVisibility(View.VISIBLE);