diff --git a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java index 10f295d11..74aacbb69 100644 --- a/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/filters/ExtendedFilterExposer.java @@ -64,7 +64,7 @@ public final class ExtendedFilterExposer extends BroadcastReceiver { Criterion.not(TaskCriteria.isVisible(DateUtilities.now())))). orderBy(Order.asc(Task.HIDE_UNTIL)), hiddenValues); - hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_calendar)).getBitmap(); + hidden.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_clouds)).getBitmap(); Filter deleted = new Filter(ExtendedPlugin.IDENTIFIER, "Deleted Tasks", diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index 080719b34..ca0a96c24 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import android.util.Log; import com.timsu.astrid.R; import com.todoroo.andlib.sql.QueryTemplate; @@ -83,7 +82,6 @@ public class TagFilterExposer extends BroadcastReceiver { "Untagged", tagService.untaggedTemplate(), null); - Log.e("sdlfk", untagged.sqlQuery); untagged.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_untagged)).getBitmap(); FilterCategory tagsCategoryBySize = new FilterCategory(TagsPlugin.IDENTIFIER, context.getString(R.string.tag_FEx_by_size), filtersBySize); diff --git a/astrid/res/drawable/tango_clouds.png b/astrid/res/drawable/tango_clouds.png new file mode 100644 index 000000000..79d7bc250 Binary files /dev/null and b/astrid/res/drawable/tango_clouds.png differ diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml index 55d99b19f..dae02138c 100644 --- a/astrid/res/layout/filter_list_activity.xml +++ b/astrid/res/layout/filter_list_activity.xml @@ -2,21 +2,21 @@ + android:layout_height="fill_parent"> diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 3fa5409e0..583ca032c 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -122,10 +122,10 @@ public class FilterAdapter extends BaseExpandableListAdapter { image.setImageResource(R.drawable.expander_ic_maximized); else image.setImageResource(R.drawable.expander_ic_minimized); - FrameLayout.LayoutParams llp = new FrameLayout.LayoutParams( + FrameLayout.LayoutParams expansionImageLayout = new FrameLayout.LayoutParams( 32, 32); - llp.gravity = Gravity.CENTER_VERTICAL; - image.setLayoutParams(llp); + expansionImageLayout.gravity = Gravity.CENTER_VERTICAL; + image.setLayoutParams(expansionImageLayout); image.setScaleType(ScaleType.FIT_CENTER); layout.addView(image); @@ -136,7 +136,10 @@ public class FilterAdapter extends BaseExpandableListAdapter { View view = augmentView(textView, filter); view.setPadding(60, 2, 0, 2); - view.setLayoutParams(llp); + FrameLayout.LayoutParams rowLayout = new FrameLayout.LayoutParams( + ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + rowLayout.gravity = Gravity.CENTER_VERTICAL; + view.setLayoutParams(rowLayout); layout.addView(view);