Add multi-touch

Author: bmeike

AndroidUIDemo/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
       android:versionName="1.0.0" package="com.oreilly.demo.android.pa.uidemo">
-    <uses-sdk android:targetSdkVersion="14"></uses-sdk>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".TouchMe"
                   android:label="@string/app_name">

AndroidUIDemo/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-8

AndroidUIDemo/res/drawable-hdpi/trashcan.png

@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:background="@drawable/lt_grey"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:baselineAligned="false">
 
+  <com.oreilly.demo.android.pa.uidemo.view.DotView
+        android:id="@+id/dots"
+        android:focusableInTouchMode="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="@drawable/white"
+        />
+    
   <LinearLayout
       android:orientation="horizontal"
       android:background="@drawable/grey"
@@ -18,16 +27,16 @@
         android:id="@+id/text1"
         android:text="@string/defaultText"
         android:focusable="false"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="0dp"
         android:layout_weight="1"/>
 
     <EditText
         android:id="@+id/text2"
         android:text="@string/defaultText"
         android:focusable="false"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="0dp"
         android:layout_weight="1"/>
   </LinearLayout>
 
@@ -41,16 +50,16 @@
         android:id="@+id/button1"
         android:text="@string/labelRed"
         android:textColor="@drawable/red"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="0dp"
         android:layout_weight="1"/>
 
     <Button
         android:id="@+id/button2"
         android:text="@string/labelGreen"
         android:textColor="@drawable/green"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="0dp"
         android:layout_weight="1"/>
   </LinearLayout>
 </LinearLayout>

AndroidUIDemo/res/drawable-ldpi/trashcan.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_clear"
+          android:title="@string/menuClear"
+          />
+
+<!-- ICS
+          android:icon="@drawable/trashcan"
+          android:showAsAction="ifRoom|withText"
+          />
+ -->
+</menu>

AndroidUIDemo/res/layout/main.xml

@@ -6,4 +6,5 @@
     <drawable name="lt_grey">#dddddd</drawable>
     <drawable name="grey">#999999</drawable>
     <drawable name="dk_grey">#666666</drawable>
+    <drawable name="white">#ffffffff</drawable>
 </resources>

AndroidUIDemo/res/menu/simple_menu.xml

@@ -4,4 +4,5 @@
     <string name="defaultText">0</string>
     <string name="labelRed">Red</string>
     <string name="labelGreen">Green</string>
+    <string name="menuClear">Clear</string>
 </resources>

AndroidUIDemo/res/values/colors.xml

@@ -1,5 +1,7 @@
 package com.oreilly.demo.android.pa.uidemo;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 import android.app.Activity;
@@ -17,8 +19,6 @@
 import android.view.View.OnKeyListener;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-
 import com.oreilly.demo.android.pa.uidemo.model.Dot;
 import com.oreilly.demo.android.pa.uidemo.model.Dots;
 import com.oreilly.demo.android.pa.uidemo.view.DotView;
@@ -36,35 +36,57 @@ private static final class TrackingTouchListener
         implements View.OnTouchListener
     {
         private final Dots mDots;
+        private List<Integer> tracks = new ArrayList<Integer>();
 
         TrackingTouchListener(Dots dots) { mDots = dots; }
 
         @Override public boolean onTouch(View v, MotionEvent evt) {
-            switch (evt.getAction()) {
+            int n;
+            int idx;
+            int action = evt.getAction();
+            switch (action & MotionEvent.ACTION_MASK) {
                 case MotionEvent.ACTION_DOWN:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    idx = (action & MotionEvent.ACTION_POINTER_INDEX_MASK)
+                        >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                    tracks.add(Integer.valueOf(evt.getPointerId(idx)));
+                    break;
+
+                case MotionEvent.ACTION_POINTER_UP:
+                    idx = (action & MotionEvent.ACTION_POINTER_INDEX_MASK)
+                        >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                    tracks.remove(Integer.valueOf(evt.getPointerId(idx)));
                     break;
 
                 case MotionEvent.ACTION_MOVE:
-                    for (int i = 0, n = evt.getHistorySize(); i < n; i++) {
-                        addDot(
-                            mDots,
-                            evt.getHistoricalX(i),
-                            evt.getHistoricalY(i),
-                            evt.getHistoricalPressure(i),
-                            evt.getHistoricalSize(i));
+                    n = evt.getHistorySize();
+                    for (Integer i: tracks) {
+                        idx = evt.findPointerIndex(i.intValue());
+                        for (int j = 0; j < n; j++) {
+                            addDot(
+                                mDots,
+                                evt.getHistoricalX(idx, j),
+                                evt.getHistoricalY(idx, j),
+                                evt.getHistoricalPressure(idx, j),
+                                evt.getHistoricalSize(idx, j));
+                        }
                     }
                     break;
 
+
                 default:
                     return false;
             }
 
-            addDot(
-                mDots,
-                evt.getX(),
-                evt.getY(),
-                evt.getPressure(),
-                evt.getSize());
+            for (Integer i: tracks) {
+                idx = evt.findPointerIndex(i.intValue());
+                addDot(
+                    mDots,
+                    evt.getX(idx),
+                    evt.getY(idx),
+                    evt.getPressure(idx),
+                    evt.getSize(idx));
+            }
 
             return true;
         }
@@ -124,35 +146,38 @@ public void run() {
     @Override public void onCreate(Bundle state) {
         super.onCreate(state);
 
-        dotView = new DotView(this, dotModel);
-        dotView.setOnCreateContextMenuListener(this);
-
         // install the view
         setContentView(R.layout.main);
-        ((LinearLayout) findViewById(R.id.root)).addView(dotView, 0);
 
+        // find the dots view
+        dotView = (DotView) findViewById(R.id.dots);
+        dotView.setDots(dotModel);
+
+        dotView.setOnCreateContextMenuListener(this);
         dotView.setOnTouchListener(new TrackingTouchListener(dotModel));
 
         dotView.setOnKeyListener(new OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (KeyEvent.ACTION_UP != event.getAction()) {
-                    int color = Color.BLUE;
-                    switch (keyCode) {
-                        case KeyEvent.KEYCODE_SPACE:
-                            color = Color.MAGENTA;
-                            break;
-                        case KeyEvent.KEYCODE_ENTER:
-                            color = Color.YELLOW;
-                            break;
-                        default: ;
-                    }
+                if (KeyEvent.ACTION_DOWN != event.getAction()) {
+                    return false;
+                }
 
-                    makeDot(dotModel, dotView, color);
+                int color;
+                switch (keyCode) {
+                    case KeyEvent.KEYCODE_SPACE:
+                        color = Color.MAGENTA;
+                        break;
+                    case KeyEvent.KEYCODE_ENTER:
+                        color = Color.BLUE;
+                        break;
+                    default:
+                        return false;
                 }
 
-                return (keyCode < KeyEvent.KEYCODE_0)
-                    ||(keyCode > KeyEvent.KEYCODE_9);
+                makeDot(dotModel, dotView, color);
+                return true;
+
             } });
 
 
@@ -194,22 +219,20 @@ else if (hasFocus && (null == dotGenerator)) {
 
     /** Install an options menu. */
     @Override public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        menu.add(Menu.NONE, 1, Menu.NONE, "Clear")
-            .setAlphabeticShortcut('x');
+        getMenuInflater().inflate(R.menu.simple_menu, menu);
         return true;
     }
 
     /** Respond to an options menu selection. */
     @Override public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case 1:
+            case R.id.menu_clear:
                 dotModel.clearDots();
                 return true;
-            default: ;
-        }
 
-        return false;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
     }
 
     /** Install a context menu. */

AndroidUIDemo/res/values/strings.xml

@@ -6,7 +6,7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
-
+import android.util.AttributeSet;
 import android.view.View;
 
 import com.oreilly.demo.android.pa.uidemo.model.Dot;
@@ -19,41 +19,54 @@
  * @author <a href="mailto:android@callmeike.net">Blake Meike</a>
  */
 public class DotView extends View {
-    private final Dots dots;
+
+    private volatile Dots dots;
 
     /**
      * @param context the rest of the application
-     * @param dots the dots we draw
      */
-    public DotView(Context context, Dots dots) {
+    public DotView(Context context) {
         super(context);
-        this.dots = dots;
-        setMinimumWidth(180);
-        setMinimumHeight(200);
-        setFocusable(true);
+        setFocusableInTouchMode(true);
     }
-        
+
+    /**
+     * @param context
+     * @param attrs
+     */
+    public DotView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setFocusableInTouchMode(true);
+    }
+
     /**
-     * @see android.view.View#onMeasure(int, int)
+     * @param context
+     * @param attrs
+     * @param defStyle
      */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(
-            getSuggestedMinimumWidth(),
-            getSuggestedMinimumHeight());
+    public DotView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setFocusableInTouchMode(true);
     }
 
+    /**
+     * @param dots
+     */
+    public void setDots(Dots dots) { this.dots = dots; }
+
     /**
      * @see android.view.View#onDraw(android.graphics.Canvas)
      */
     @Override protected void onDraw(Canvas canvas) {
-        canvas.drawColor(Color.WHITE);
- 
+        //canvas.drawColor(Color.WHITE);
+
         Paint paint = new Paint();
         paint.setStyle(Style.STROKE);
         paint.setColor(hasFocus() ? Color.BLUE : Color.GRAY);
         canvas.drawRect(0, 0, getWidth() - 1, getHeight() -1, paint);
- 
+
+        if (null == dots) { return; }
+
         paint.setStyle(Style.FILL);
         for (Dot dot : dots.getDots()) {
             paint.setColor(dot.getColor());