diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 1cc711c5f..42d820afb 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -78,7 +78,6 @@ diff --git a/astrid/res/drawable/ic_dialog_alert_c.png b/astrid/res/drawable/ic_dialog_alert_c.png deleted file mode 100644 index d0c6f2f39..000000000 Binary files a/astrid/res/drawable/ic_dialog_alert_c.png and /dev/null differ diff --git a/astrid/res/drawable/ic_dialog_info_c.png b/astrid/res/drawable/ic_dialog_info_c.png deleted file mode 100644 index a11458967..000000000 Binary files a/astrid/res/drawable/ic_dialog_info_c.png and /dev/null differ diff --git a/astrid/res/drawable/ic_dialog_time_c.png b/astrid/res/drawable/ic_dialog_time_c.png deleted file mode 100644 index 20b805ad1..000000000 Binary files a/astrid/res/drawable/ic_dialog_time_c.png and /dev/null differ diff --git a/astrid/res/drawable/icon.png b/astrid/res/drawable/icon.png index fee7992e4..25402e7f6 100644 Binary files a/astrid/res/drawable/icon.png and b/astrid/res/drawable/icon.png differ diff --git a/astrid/res/drawable/icon_add.png b/astrid/res/drawable/icon_add.png deleted file mode 100644 index 98e065838..000000000 Binary files a/astrid/res/drawable/icon_add.png and /dev/null differ diff --git a/astrid/res/drawable/icon_blank.png b/astrid/res/drawable/icon_blank.png new file mode 100644 index 000000000..d490f6130 Binary files /dev/null and b/astrid/res/drawable/icon_blank.png differ diff --git a/astrid/res/drawable/icon_tag.png b/astrid/res/drawable/icon_tag.png deleted file mode 100644 index bf3e1969b..000000000 Binary files a/astrid/res/drawable/icon_tag.png and /dev/null differ diff --git a/astrid/res/drawable/tea_tab_basic.png b/astrid/res/drawable/tea_tab_basic.png index 91cc4b0d1..8ef006005 100644 Binary files a/astrid/res/drawable/tea_tab_basic.png and b/astrid/res/drawable/tea_tab_basic.png differ diff --git a/astrid/res/drawable/tea_tab_extensions.png b/astrid/res/drawable/tea_tab_extensions.png index 5ddce8801..8bad05dfc 100644 Binary files a/astrid/res/drawable/tea_tab_extensions.png and b/astrid/res/drawable/tea_tab_extensions.png differ diff --git a/astrid/res/drawable/tea_tab_extra.png b/astrid/res/drawable/tea_tab_extra.png index 69323d567..de1e16e4c 100644 Binary files a/astrid/res/drawable/tea_tab_extra.png and b/astrid/res/drawable/tea_tab_extra.png differ diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java index ff5d79478..b2073c015 100644 --- a/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java +++ b/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java @@ -38,22 +38,22 @@ import android.os.Bundle; import android.os.Handler; import android.util.Log; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.ViewGroup; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnCreateContextMenuListener; +import android.view.ViewGroup; import android.widget.AdapterView; +import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import android.widget.AdapterView.AdapterContextMenuInfo; -import android.widget.AdapterView.OnItemClickListener; import com.flurry.android.FlurryAgent; import com.timsu.astrid.R; @@ -405,7 +405,7 @@ public class TagListSubActivity extends SubActivity { createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label); createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, - ((BitmapDrawable)r.getDrawable(R.drawable.icon_tag)).getBitmap()); + ((BitmapDrawable)r.getDrawable(R.drawable.icon_blank)).getBitmap()); createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$ getParent().sendBroadcast(createShortcutIntent); diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index fc552aba6..8d89d6d6e 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -24,6 +24,7 @@ import android.view.View; import android.widget.EditText; import android.widget.ExpandableListView; import android.widget.ExpandableListView.ExpandableListContextMenuInfo; +import android.widget.FrameLayout; import android.widget.Toast; import com.flurry.android.FlurryAgent; @@ -299,21 +300,19 @@ public class FilterListActivity extends ExpandableListActivity { * @param label */ private void createShortcut(Filter filter, Intent shortcutIntent, String label) { - Bitmap bitmap; - if(filter.listingIcon == null) - bitmap = ((BitmapDrawable) getResources().getDrawable( - R.drawable.icon_tag)).getBitmap(); - else { - // create icon by superimposing astrid w/ icon - bitmap = ((BitmapDrawable) getResources().getDrawable( - R.drawable.icon)).getBitmap(); - bitmap = bitmap.copy(bitmap.getConfig(), true); - Canvas canvas = new Canvas(bitmap); - /*canvas.drawBitmap(filter.listingIcon, bitmap.getWidth() - - filter.listingIcon.getWidth(), bitmap.getHeight() - - filter.listingIcon.getHeight(), null);*/ - canvas.save(); - } + Bitmap emblem = filter.listingIcon; + if(emblem == null) + emblem = ((BitmapDrawable) getResources().getDrawable( + R.drawable.filter_tags1)).getBitmap(); + // create icon by superimposing astrid w/ icon + Bitmap bitmap = ((BitmapDrawable) getResources().getDrawable( + R.drawable.icon_blank)).getBitmap(); + bitmap = bitmap.copy(bitmap.getConfig(), true); + Canvas canvas = new Canvas(bitmap); + canvas.drawBitmap(emblem, Math.max(0, bitmap.getWidth() - + emblem.getWidth()), Math.max(0, bitmap.getHeight() - + emblem.getHeight()), null); + Intent createShortcutIntent = new Intent(); createShortcutIntent.putExtra( Intent.EXTRA_SHORTCUT_INTENT, @@ -353,13 +352,18 @@ public class FilterListActivity extends ExpandableListActivity { final Intent shortcutIntent = item.getIntent(); final Filter filter = (Filter)info.targetView.getTag(); + FrameLayout frameLayout = new FrameLayout(this); + frameLayout.setPadding(10, 0, 10, 0); final EditText editText = new EditText(this); editText.setText(filter.listingTitle); + frameLayout.addView(editText, new FrameLayout.LayoutParams( + FrameLayout.LayoutParams.FILL_PARENT, + FrameLayout.LayoutParams.WRAP_CONTENT)); new AlertDialog.Builder(this) .setTitle(R.string.FLA_shortcut_dialog_title) .setMessage(R.string.FLA_shortcut_dialog) - .setView(editText) + .setView(frameLayout) .setIcon(android.R.drawable.ic_dialog_info) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) {