Can now be added to XML layout.

Added support for setting bitmap to null without throwing exception.

Signed-off-by: Patrick Lackemacher <[email protected]>

.classpath

@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

README

@@ -1,5 +1,11 @@
 Android: TouchImageView
 Created by: Mike Ortiz
-Date: 9/17/2011
+Updated by: Patrick Lackemacher
+Date: 2/17/2012
 ----------------------
-Adds panning and pinch zoom to Android ImageView.
+Adds panning and pinch zoom to Android ImageView.
+
+Update:
+----------------------
+Can now be added to XML layout.
+Added support for setting bitmap to null without throwing exception.

src/com/example/touch/TouchImageView.java

@@ -1,6 +1,7 @@
 /*
  * TouchImageView.java
  * By: Michael Ortiz
+ * Updated By: Patrick Lackemacher
  * -------------------
  * Extends Android ImageView to include pinch zooming and panning.
  */
@@ -11,6 +12,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.graphics.PointF;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
@@ -44,10 +46,18 @@ public class TouchImageView extends ImageView {
 
     Context context;
 
-
     public TouchImageView(Context context) {
         super(context);
-        super.setClickable(true);
+        sharedConstructing(context);
+    }
+
+    public TouchImageView(Context context, AttributeSet attrs) {
+    	super(context, attrs);
+    	sharedConstructing(context);
+    }
+
+    private void sharedConstructing(Context context) {
+    	super.setClickable(true);
         this.context = context;
         mScaleDetector = new ScaleGestureDetector(context, new ScaleListener());
         matrix.setTranslate(1f, 1f);
@@ -129,8 +139,10 @@ else if (y + deltaY < -bottom)
     @Override
     public void setImageBitmap(Bitmap bm) { 
         super.setImageBitmap(bm);
-        bmWidth = bm.getWidth();
-        bmHeight = bm.getHeight();
+        if(bm != null) {
+        	bmWidth = bm.getWidth();
+        	bmHeight = bm.getHeight();
+        }
     }
 
     public void setMaxZoom(float x)