Merge "Clean up on VectorDrawable."

graphics/java/android/graphics/drawable/VectorDrawable.java

@@ -61,9 +61,9 @@ import java.util.HashSet;
  * <p/>
  * <dl>
  * <dt><code>&lt;vector></code></dt>
- * <dd> * The attribute <code>android:trigger</code> defines a state change that
+ * <dd>The attribute <code>android:trigger</code> defines a state change that
  * will drive the animation </dd>
- * <dd> * The attribute <code>android:versionCode</code> defines the version of
+ * <dd>The attribute <code>android:versionCode</code> defines the version of
  * VectorDrawable </dd>
  * <dt><code>&lt;size></code></dt>
  * <dd>Used to defined the intrinsic Width Height size of the drawable using

tests/DynamicDrawableTest/lint.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-</lint>

tests/VectorDrawableTest/Android.mk

@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_PACKAGE_NAME := DynamicDrawableTest
+LOCAL_PACKAGE_NAME := VectorDrawableTest
 
 LOCAL_MODULE_TAGS := tests
 

tests/VectorDrawableTest/AndroidManifest.xml

@@ -73,7 +73,7 @@
             </intent-filter>
 
         </activity>
-        
+
         <activity
             android:name="VectorCheckbox"
             android:label="On a Checkbox" >

tests/VectorDrawableTest/res/drawable/vector_drawable11.xml

@@ -29,7 +29,7 @@
             android:pathData="M 20.28125,2.0000002 C 17.352748,2.0000002 15,4.3527485 15,7.2812502 L 15,8.0000002 L 13.15625,8.0000002 C 9.7507553,8.0000002 7,10.750759 7,14.15625 L 7,39.84375 C 7,43.24924 9.7507558,46 13.15625,46 L 33.84375,46 C 37.249245,46 39.999999,43.24924 40,39.84375 L 40,14.15625 C 40,10.75076 37.249243,8.0000002 33.84375,8.0000002 L 32,8.0000002 L 32,7.2812502 C 32,4.3527485 29.647252,2.0000002 26.71875,2.0000002 L 20.28125,2.0000002 z"
             android:fill="#3388ff"
             android:stroke="#ff8833"
-            android:strokeWidth="1" 
+            android:strokeWidth="1"
             android:rotation="0"/>
          <path
             android:name="spark"

tests/VectorDrawableTest/src/com/android/test/dynamic/VectorCheckbox.java

@@ -60,7 +60,6 @@ public class VectorCheckbox extends Activity {
             CheckBox checkBox = new CheckBox(this);
             bArray[i] = checkBox;
             checkBox.setWidth(200);
-            checkBox.setWidth(200);
             checkBox.setButtonDrawable(icon[i]);
             container.addView(checkBox);
         }

tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawable01.java

@@ -59,7 +59,6 @@ public class VectorDrawable01 extends Activity implements View.OnClickListener {
             Button button = new Button(this);
             bArray[i] = button;
             button.setWidth(200);
-            button.setWidth(200);
             button.setBackgroundResource(icon[i]);
             container.addView(button);
             button.setOnClickListener(this);

tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java

@@ -74,7 +74,6 @@ public class VectorDrawablePerformance extends Activity implements View.OnClickL
         for (int i = 0; i < icon.length; i++) {
             Button button = new Button(this);
             button.setWidth(200);
-            button.setWidth(200);
             button.setBackgroundResource(icon[i]);
             container.addView(button);
             button.setOnClickListener(this);