Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev (cb721bf6) · Commits · e / os / android_frameworks_base

tests/VectorDrawableTest/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,4 +23,6 @@ LOCAL_PACKAGE_NAME := VectorDrawableTest

		LOCAL_MODULE_TAGS := tests

		LOCAL_SDK_VERSION := current

		include $(BUILD_PACKAGE)

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

+33 −1

Original line number	Diff line number	Diff line
		@@ -17,11 +17,18 @@ import android.app.Activity;
		import android.content.res.Resources;
		import android.graphics.drawable.VectorDrawable;
		import android.os.Bundle;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.Xml;
		import android.widget.TextView;
		import android.widget.Button;
		import android.widget.GridLayout;
		import android.widget.ScrollView;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;
		import java.text.DecimalFormat;

		@SuppressWarnings({"UnusedDeclaration"})
		@@ -60,6 +67,31 @@ public class VectorDrawablePerformance extends Activity {
		R.drawable.vector_drawable30,
		};

		public static VectorDrawable create(Resources resources, int rid) {
		try {
		final XmlPullParser parser = resources.getXml(rid);
		final AttributeSet attrs = Xml.asAttributeSet(parser);
		int type;
		while ((type=parser.next()) != XmlPullParser.START_TAG &&
		type != XmlPullParser.END_DOCUMENT) {
		// Empty loop
		}
		if (type != XmlPullParser.START_TAG) {
		throw new XmlPullParserException("No start tag found");
		}

		final VectorDrawable drawable = new VectorDrawable();
		drawable.inflate(resources, parser, attrs);

		return drawable;
		} catch (XmlPullParserException e) {
		Log.e(LOGCAT, "parser error", e);
		} catch (IOException e) {
		Log.e(LOGCAT, "parser error", e);
		}
		return null;
		}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		@@ -72,7 +104,7 @@ public class VectorDrawablePerformance extends Activity {
		VectorDrawable []d = new VectorDrawable[icon.length];
		long time = android.os.SystemClock.elapsedRealtimeNanos();
		for (int i = 0; i < icon.length; i++) {
		d[i] = VectorDrawable.create(res,icon[i]);
		d[i] = create(res,icon[i]);
		}
		time = android.os.SystemClock.elapsedRealtimeNanos()-time;
		TextView t = new TextView(this);