mipmap launcher icons

src/main/AndroidManifest.xml

@@ -94,7 +94,7 @@
         android:required="false" />
 
     <application
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Tasks"
         android:allowBackup="true"

src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java

@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -66,7 +65,7 @@ public class FilterShortcutActivity extends InjectingListActivity {
             }
             Intent shortcutIntent = ShortcutActivity.createIntent(context, filter);
 
-            Bitmap bitmap = superImposeListIcon(FilterShortcutActivity.this);
+            Bitmap bitmap = ((BitmapDrawable) getResources().getDrawable(R.mipmap.ic_launcher)).getBitmap();
             Intent intent = new Intent();
             intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
             intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, filter.listingTitle);
@@ -77,10 +76,6 @@ public class FilterShortcutActivity extends InjectingListActivity {
         }
    };
 
-    private static Bitmap superImposeListIcon(Activity activity) {
-        return ((BitmapDrawable)activity.getResources().getDrawable(R.drawable.icon)).getBitmap();
-    }
-
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
         super.onListItemClick(l, v, position, id);

src/main/res/layout/astrid_speech_bubble.xml

@@ -19,7 +19,7 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_marginBottom="5dip"
-	        android:src="@drawable/icon"
+	        android:src="@mipmap/ic_launcher"
 	        android:scaleType="fitCenter"
 	        android:layout_alignParentLeft="true"/>
 	    

src/main/res/layout/task_list_swipe_layout_empty.xml

@@ -14,7 +14,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:clickable="true"
-            android:drawableTop="@drawable/icon"
+            android:drawableTop="@mipmap/ic_launcher"
             android:gravity="center"
             android:textColor="?attr/asTextColor"
             android:text="@string/TLA_no_items" />