JAX updates from the Android presetation

vogella · vogella · commit 4b77a37638cb · 2014-05-27T17:39:23.000+02:00
diff --git a/com.vogella.android.actionbar.navigationdrawer/project.properties b/com.vogella.android.actionbar.navigationdrawer/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.animation.views/project.properties b/com.vogella.android.animation.views/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.customview.canvas/project.properties b/com.vogella.android.customview.canvas/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.customview.canvas/res/drawable-hdpi/background.png b/com.vogella.android.customview.canvas/res/drawable-hdpi/background.png
diff --git a/com.vogella.android.customview.canvas/res/drawable-hdpi/splash1.png b/com.vogella.android.customview.canvas/res/drawable-hdpi/splash1.png
diff --git a/com.vogella.android.customview.canvas/res/layout/activity_main.xml b/com.vogella.android.customview.canvas/res/layout/activity_main.xml
@@ -4,11 +4,12 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity" >
 
-    <TextView
+    <com.vogella.android.customview.canvas.DrawingView
+        android:id="@+id/drawingView1"
+        android:background="@drawable/splash1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world" />
+        android:layout_centerVertical="true" />
 
 </RelativeLayout>
diff --git a/com.vogella.android.customview.canvas/src/com/vogella/android/customview/canvas/DrawingView.java b/com.vogella.android.customview.canvas/src/com/vogella/android/customview/canvas/DrawingView.java
@@ -1,6 +1,7 @@
 package com.vogella.android.customview.canvas;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
@@ -21,7 +22,6 @@ public class DrawingView extends View {
 	/** Need to track this so the dirty region can accommodate the stroke. **/
 	private static final float HALF_STROKE_WIDTH = STROKE_WIDTH / 2;
 
-	private Paint paint = new Paint();
 	private List<Path> paths = new ArrayList<Path>();
 	private List<Paint> paints = new ArrayList<Paint>();
 
@@ -34,7 +34,7 @@ public class DrawingView extends View {
 
 	private int[] colors;
 
-	private Path path;
+	private Path path = new Path();
 
 	private int nextColor;
 
@@ -45,13 +45,19 @@ public DrawingView(Context context, AttributeSet attrs) {
 
 		colors = new int[] { Color.BLUE, Color.CYAN, Color.GREEN,
 				Color.MAGENTA, Color.YELLOW, Color.RED, Color.WHITE };
+
 		random = new Random();
 		nextColor = random.nextInt(colors.length);
-		paint.setAntiAlias(true);
-		paint.setColor(Color.WHITE);
-		paint.setStyle(Paint.Style.STROKE);
-		paint.setStrokeJoin(Paint.Join.ROUND);
-		paint.setStrokeWidth(STROKE_WIDTH);
+		for (int i = 0; i < colors.length; i++) {
+			Paint paint = new Paint();
+			paint.setAntiAlias(true);
+			paint.setColor(colors[i]);
+			paint.setStyle(Paint.Style.STROKE);
+			paint.setStrokeJoin(Paint.Join.ROUND);
+			paint.setStrokeWidth(STROKE_WIDTH);
+			paints.add(paint);
+		}
+
 	}
 
 	/**
@@ -67,10 +73,16 @@ public void clear() {
 
 	@Override
 	protected void onDraw(Canvas canvas) {
-		canvas.drawARGB(50, 255, 0, 0);
+		if (isInEditMode()) {
+			canvas.drawARGB(255, 255, 0, 0);
+		}
+		super.onDraw(canvas);
 		int i = 0;
 		for (Path path : paths) {
 			canvas.drawPath(path, paints.get(i++));
+			if (i == paints.size()) {
+				i = 0;
+			}
 		}
 	}
 
@@ -81,16 +93,15 @@ public boolean onTouchEvent(MotionEvent event) {
 
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
+			path = new Path();
+			paths.add(path);
 			path.moveTo(eventX, eventY);
 			return true;
 
 		case MotionEvent.ACTION_MOVE:
+			path.lineTo(eventX, eventY);
 		case MotionEvent.ACTION_UP:
-
-			path.lineTo(x, y);
-
 			// After replaying history, connect the line to the touch point.
-			path.lineTo(eventX, eventY);
 			break;
 
 		default:
diff --git a/com.vogella.android.customview.canvas/src/com/vogella/android/customview/canvas/MainActivity.java b/com.vogella.android.customview.canvas/src/com/vogella/android/customview/canvas/MainActivity.java
@@ -9,7 +9,7 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(new SignatureView(this, null));
+		setContentView(R.layout.activity_main);
 	}
 
 	@Override
diff --git a/com.vogella.android.customview.compoundview.simple/.settings/org.eclipse.jdt.core.prefs b/com.vogella.android.customview.compoundview.simple/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/com.vogella.android.customview.compoundview/project.properties b/com.vogella.android.customview.compoundview/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.customview.compoundview/src/com/vogella/android/customview/compoundview/ColorOptionsView.java b/com.vogella.android.customview.compoundview/src/com/vogella/android/customview/compoundview/ColorOptionsView.java
@@ -15,7 +15,6 @@
 public class ColorOptionsView extends LinearLayout {
 
 	private View mValue;
-	private ImageView mImage;
 
 	public ColorOptionsView(Context context, AttributeSet attrs) {
 		super(context, attrs);
@@ -50,8 +49,5 @@ public void setValueColor(int color) {
 		mValue.setBackgroundColor(color);
 	}
 
-	public void setImageVisible(boolean visible) {
-		mImage.setVisibility(visible ? View.VISIBLE : View.GONE);
-	}
 
 }
diff --git a/com.vogella.android.customview.persistence/project.properties b/com.vogella.android.customview.persistence/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.customview.spotlight/project.properties b/com.vogella.android.customview.spotlight/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.customview.surfaceviewball/project.properties b/com.vogella.android.customview.surfaceviewball/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash2.png b/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash2.png
diff --git a/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash3.png b/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash3.png
diff --git a/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash4.png b/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash4.png
diff --git a/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash5.png b/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash5.png
diff --git a/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash6.png b/com.vogella.android.drawables.custom.inlist/res/drawable-nodpi/splash6.png
diff --git a/com.vogella.android.drawables.custom.inlist/src/com/example/roundrectshader/StreamActivity.java b/com.vogella.android.drawables.custom.inlist/src/com/example/roundrectshader/StreamActivity.java
@@ -37,12 +37,11 @@ protected void onCreate(Bundle savedInstanceState) {
 		((ListView) findViewById(R.id.main_list)).setAdapter(adapter);
 
 		adapter.add(new StreamItem(this, R.drawable.splash1, "voclipse", "Custom Eclipse IDE"));
-		adapter.add(new StreamItem(this, R.drawable.photo2, "Starry night", "Lake Powell, AZ"));
-		adapter.add(new StreamItem(this, R.drawable.photo3, "Racetrack playa", "Death Valley, CA"));
-		adapter.add(new StreamItem(this, R.drawable.photo4, "Napali coast", "Kauai, HI"));
-		adapter.add(new StreamItem(this, R.drawable.photo5, "Delicate Arch", "Arches, UT"));
-		adapter.add(new StreamItem(this, R.drawable.photo6, "Sierra sunset", "Lone Pine, CA"));
-		adapter.add(new StreamItem(this, R.drawable.photo7, "Majestic", "Grand Teton, WY"));
+		adapter.add(new StreamItem(this, R.drawable.splash2, "Wizard", "vogella"));
+		adapter.add(new StreamItem(this, R.drawable.splash3, "Lars Vogel", "vogella GmbH"));
+		adapter.add(new StreamItem(this, R.drawable.splash4, "Example ", "More"));
+		adapter.add(new StreamItem(this, R.drawable.splash5, "Testing", "Help"));
+		adapter.add(new StreamItem(this, R.drawable.splash6, "Test ", "Testing, "));
 	}
 
 	class StreamItem {
diff --git a/com.vogella.android.drawables.custom/project.properties b/com.vogella.android.drawables.custom/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-19
diff --git a/com.vogella.android.drawables.custom/res/layout/activity_main.xml b/com.vogella.android.drawables.custom/res/layout/activity_main.xml
@@ -6,8 +6,9 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="400dp"
+        android:layout_height="400dp"
+        android:scaleType="fitXY"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:contentDescription="TODO" />
diff --git a/com.vogella.android.drawables.custom/src/com/vogella/android/drawables/custom/MyRoundCornerDrawable.java b/com.vogella.android.drawables.custom/src/com/vogella/android/drawables/custom/MyRoundCornerDrawable.java
@@ -5,6 +5,7 @@
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
+import android.graphics.PixelFormat;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
@@ -33,17 +34,17 @@ public void draw(Canvas canvas) {
 
 	@Override
 	public void setAlpha(int alpha) {
-
+		paint.setAlpha(alpha);
 	}
 
 	@Override
 	public void setColorFilter(ColorFilter cf) {
-
+		paint.setColorFilter(cf);
 	}
 
 	@Override
 	public int getOpacity() {
-		return 255;
+		return PixelFormat.TRANSLUCENT;
 	}
 
 }
diff --git a/com.vogella.android.list.swipetodismiss/project.properties b/com.vogella.android.list.swipetodismiss/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/com.vogella.android.listview3d/src/com/vogella/android/listview3d/ListView3d.java b/com.vogella.android.listview3d/src/com/vogella/android/listview3d/ListView3d.java
@@ -12,6 +12,8 @@
 import android.view.View;
 import android.widget.ListView;
 
+// See the original example at https://github.com/renard314/ListView3d
+
 public class ListView3d extends ListView {
 
 	/** Ambient light intensity */
diff --git a/com.vogella.android.touch.single/project.properties b/com.vogella.android.touch.single/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-19
diff --git a/com.vogella.android.touch.single/src/com/vogella/android/touch/single/SingleTouchEventView.java b/com.vogella.android.touch.single/src/com/vogella/android/touch/single/SingleTouchEventView.java
@@ -6,11 +6,13 @@
 import android.graphics.Path;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
+import android.view.VelocityTracker;
 import android.view.View;
 
 public class SingleTouchEventView extends View {
   private Paint paint = new Paint();
   private Path path = new Path();
+  private VelocityTracker mVelocityTracker;
 
   public SingleTouchEventView(Context context, AttributeSet attrs) {
     super(context, attrs);
@@ -35,12 +37,15 @@ public boolean onTouchEvent(MotionEvent event) {
     switch (event.getAction()) {
     case MotionEvent.ACTION_DOWN:
       path.moveTo(eventX, eventY);
+      mVelocityTracker = VelocityTracker.obtain();
+      mVelocityTracker.addMovement(event);
       return true;
     case MotionEvent.ACTION_MOVE:
+    
       path.lineTo(eventX, eventY);
       break;
     case MotionEvent.ACTION_UP:
-      // nothing to do
+      
       break;
     default:
       return false;
diff --git a/com.vogella.android.userinterface.undo/res/layout/activity_main.xml b/com.vogella.android.userinterface.undo/res/layout/activity_main.xml
@@ -19,7 +19,6 @@
         android:background="#808080"
         android:dividerPadding="11dp"
         android:padding="4dp"
-        android:visibility="gone" 
         >
 
         <TextView
diff --git a/de.vogella.android.drawables.shapes/project.properties b/de.vogella.android.drawables.shapes/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-15
+target=android-19
diff --git a/de.vogella.android.handler.looper/project.properties b/de.vogella.android.handler.looper/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:19
diff --git a/de.vogella.android.handler/project.properties b/de.vogella.android.handler/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-18
diff --git a/de.vogella.android.kidsdrawing/project.properties b/de.vogella.android.kidsdrawing/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-19
diff --git a/de.vogella.android.listview/project.properties b/de.vogella.android.listview/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:17
+target=Google Inc.:Google APIs:19

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class MainActivity extends Activity {`
`9`	`9`	`@Override`
`10`	`10`	`protected void onCreate(Bundle savedInstanceState) {`
`11`	`11`	`super.onCreate(savedInstanceState);`
`12`		`- setContentView(new SignatureView(this, null));`
	`12`	`+ setContentView(R.layout.activity_main);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`