Merge "Fix the render order to follow the XML file order." (4239469b) · Commits · e / os / android_frameworks_base

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

+124 −132

Original line number	Diff line number	Diff line
		@@ -299,7 +299,6 @@ public class VectorDrawable extends Drawable {
		return color;
		}


		@Override
		public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)
		throws XmlPullParserException, IOException {
		@@ -358,7 +357,7 @@ public class VectorDrawable extends Drawable {
		if (SHAPE_PATH.equals(tagName)) {
		final VPath path = new VPath();
		path.inflate(res, attrs, theme);
		currentGroup.add(path);
		currentGroup.mChildren.add(path);
		if (path.getPathName() != null) {
		pathRenderer.mVGTargetsMap.put(path.getPathName(), path);
		}
		@@ -375,7 +374,7 @@ public class VectorDrawable extends Drawable {
		} else if (SHAPE_GROUP.equals(tagName)) {
		VGroup newChildGroup = new VGroup();
		newChildGroup.inflate(res, attrs, theme);
		currentGroup.mChildGroupList.add(newChildGroup);
		currentGroup.mChildren.add(newChildGroup);
		groupStack.push(newChildGroup);
		if (newChildGroup.getGroupName() != null) {
		pathRenderer.mVGTargetsMap.put(newChildGroup.getGroupName(),
		@@ -431,9 +430,12 @@ public class VectorDrawable extends Drawable {
		Log.v(LOGTAG, indent + "current group is :" + currentGroup.getGroupName()
		+ " rotation is " + currentGroup.mRotate);
		Log.v(LOGTAG, indent + "matrix is :" + currentGroup.getLocalMatrix().toString());
		// Then print all the children
		for (int i = 0 ; i < currentGroup.mChildGroupList.size(); i++) {
		printGroupTree(currentGroup.mChildGroupList.get(i), level + 1);
		// Then print all the children groups
		for (int i = 0; i < currentGroup.mChildren.size(); i++) {
		Object child = currentGroup.mChildren.get(i);
		if (child instanceof VGroup) {
		printGroupTree((VGroup) child, level + 1);
		}
		}
		}

		@@ -552,22 +554,22 @@ public class VectorDrawable extends Drawable {
		private boolean recursiveCanApplyTheme(VGroup currentGroup) {
		// We can do a tree traverse here, if there is one path return true,
		// then we return true for the whole tree.
		final ArrayList<VPath> paths = currentGroup.mPathList;
		for (int j = paths.size() - 1; j >= 0; j--) {
		final VPath path = paths.get(j);
		if (path.canApplyTheme()) {
		return true;
		}
		}

		final ArrayList<VGroup> childGroups = currentGroup.mChildGroupList;
		final ArrayList<Object> children = currentGroup.mChildren;

		for (int i = 0; i < childGroups.size(); i++) {
		VGroup childGroup = childGroups.get(i);
		for (int i = 0; i < children.size(); i++) {
		Object child = children.get(i);
		if (child instanceof VGroup) {
		VGroup childGroup = (VGroup) child;
		if (childGroup.canApplyTheme()
		\|\| recursiveCanApplyTheme(childGroup)) {
		return true;
		}
		} else if (child instanceof VPath) {
		VPath childPath = (VPath) child;
		if (childPath.canApplyTheme()) {
		return true;
		}
		}
		}
		return false;
		}
		@@ -580,24 +582,22 @@ public class VectorDrawable extends Drawable {
		private void recursiveApplyTheme(VGroup currentGroup, Theme t) {
		// We can do a tree traverse here, apply theme to all paths which
		// can apply theme.
		final ArrayList<VPath> paths = currentGroup.mPathList;
		for (int j = paths.size() - 1; j >= 0; j--) {
		final VPath path = paths.get(j);
		if (path.canApplyTheme()) {
		path.applyTheme(t);
		}
		}

		final ArrayList<VGroup> childGroups = currentGroup.mChildGroupList;

		for (int i = 0; i < childGroups.size(); i++) {
		VGroup childGroup = childGroups.get(i);
		final ArrayList<Object> children = currentGroup.mChildren;
		for (int i = 0; i < children.size(); i++) {
		Object child = children.get(i);
		if (child instanceof VGroup) {
		VGroup childGroup = (VGroup) child;
		if (childGroup.canApplyTheme()) {
		childGroup.applyTheme(t);
		}
		recursiveApplyTheme(childGroup, t);
		} else if (child instanceof VPath) {
		VPath childPath = (VPath) child;
		if (childPath.canApplyTheme()) {
		childPath.applyTheme(t);
		}
		}
		}

		}

		public void setColorFilter(ColorFilter colorFilter) {
		@@ -624,11 +624,18 @@ public class VectorDrawable extends Drawable {
		currentGroup.mStackedMatrix.preConcat(currentGroup.mLocalMatrix);

		float stackedAlpha = currentAlpha * currentGroup.mGroupAlpha;
		drawPath(currentGroup, stackedAlpha, canvas, w, h);
		// Draw the group tree in post order.
		for (int i = 0 ; i < currentGroup.mChildGroupList.size(); i++) {
		drawGroupTree(currentGroup.mChildGroupList.get(i),
		currentGroup.mStackedMatrix, stackedAlpha, canvas, w, h);

		// Draw the group tree in the same order as the XML file.
		for (int i = 0; i < currentGroup.mChildren.size(); i++) {
		Object child = currentGroup.mChildren.get(i);
		if (child instanceof VGroup) {
		VGroup childGroup = (VGroup) child;
		drawGroupTree(childGroup, currentGroup.mStackedMatrix,
		stackedAlpha, canvas, w, h);
		} else if (child instanceof VPath) {
		VPath childPath = (VPath) child;
		drawPath(currentGroup, childPath, stackedAlpha, canvas, w, h);
		}
		}
		}

		@@ -637,7 +644,8 @@ public class VectorDrawable extends Drawable {
		drawGroupTree(mRootGroup, IDENTITY_MATRIX, ((float) mRootAlpha) / 0xFF, canvas, w, h);
		}

		private void drawPath(VGroup vGroup, float stackedAlpha, Canvas canvas, int w, int h) {
		private void drawPath(VGroup vGroup, VPath vPath, float stackedAlpha,
		Canvas canvas, int w, int h) {
		final float scale = Math.min(h / mViewportHeight, w / mViewportWidth);

		mFinalPathMatrix.set(vGroup.mStackedMatrix);
		@@ -645,9 +653,6 @@ public class VectorDrawable extends Drawable {
		mFinalPathMatrix.postTranslate(
		w / 2f - mViewportWidth / 2f, h / 2f - mViewportHeight / 2f);

		ArrayList<VPath> paths = vGroup.getPaths();
		for (int i = 0; i < paths.size(); i++) {
		VPath vPath = paths.get(i);
		vPath.toPath(mPath);
		final Path path = mPath;

		@@ -716,7 +721,6 @@ public class VectorDrawable extends Drawable {
		}
		}
		}
		}

		private void parseViewport(Resources r, AttributeSet attrs)
		throws XmlPullParserException {
		@@ -771,8 +775,7 @@ public class VectorDrawable extends Drawable {

		/////////////////////////////////////////////////////
		// Variables below need to be copied (deep copy if applicable) for mutation.
		private final ArrayList<VPath> mPathList = new ArrayList<VPath>();
		private final ArrayList<VGroup> mChildGroupList = new ArrayList<VGroup>();
		final ArrayList<Object> mChildren = new ArrayList<Object>();

		private float mRotate = 0;
		private float mPivotX = 0;
		@@ -808,18 +811,20 @@ public class VectorDrawable extends Drawable {

		mLocalMatrix.set(copy.mLocalMatrix);

		for (int i = 0; i < copy.mPathList.size(); i ++) {
		VPath copyPath = copy.mPathList.get(i);
		final ArrayList<Object> children = copy.mChildren;
		for (int i = 0; i < children.size(); i++) {
		Object copyChild = children.get(i);
		if (copyChild instanceof VGroup) {
		VGroup copyGroup = (VGroup) copyChild;
		mChildren.add(new VGroup(copyGroup, targetsMap));
		} else if (copyChild instanceof VPath) {
		VPath copyPath = (VPath) copyChild;
		VPath newPath = new VPath(copyPath);
		mPathList.add(newPath);
		mChildren.add(newPath);
		if (newPath.mPathName != null) {
		targetsMap.put(copyPath.mPathName, newPath);
		targetsMap.put(newPath.mPathName, newPath);
		}
		}

		for (int i = 0; i < copy.mChildGroupList.size(); i ++) {
		VGroup currentGroup = copy.mChildGroupList.get(i);
		mChildGroupList.add(new VGroup(currentGroup, targetsMap));
		}
		}

		@@ -922,10 +927,6 @@ public class VectorDrawable extends Drawable {
		return mLocalMatrix;
		}

		public void add(VPath path) {
		mPathList.add(path);
		}

		public boolean canApplyTheme() {
		return mThemeAttrs != null;
		}
		@@ -980,15 +981,6 @@ public class VectorDrawable extends Drawable {
		mLocalMatrix.postRotate(mRotate, 0, 0);
		mLocalMatrix.postTranslate(mTranslateX + mPivotX, mTranslateY + mPivotY);
		}

		/**
		* Must return in order of adding
		* @return ordered list of paths
		*/
		public ArrayList<VPath> getPaths() {
		return mPathList;
		}

		}

		private static class VPath {
		@@ -1012,7 +1004,7 @@ public class VectorDrawable extends Drawable {
		float mStrokeMiterlimit = 4;

		private PathParser.PathDataNode[] mNodes = null;
		private String mPathName;
		String mPathName;
		private int mChangingConfigurations;

		public VPath() {

tests/VectorDrawableTest/res/drawable/vector_drawable25.xml

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2014 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android" >

		<size
		android:height="64dp"
		android:width="64dp" />

		<viewport
		android:viewportHeight="400"
		android:viewportWidth="400" />

		<group
		android:name="FirstLevelGroup"
		android:alpha="0.9"
		android:translateX="100.0"
		android:translateY="0.0" >
		<group
		android:name="SecondLevelGroup1"
		android:alpha="0.9"
		android:translateX="-100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FF00FF00"
		android:pathData="@string/rectangle200" />

		<group
		android:name="ThridLevelGroup1"
		android:alpha="0.9"
		android:translateX="-100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FF0000FF"
		android:pathData="@string/rectangle200" />
		</group>
		<group
		android:name="ThridLevelGroup2"
		android:alpha="0.8"
		android:translateX="100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FF000000"
		android:pathData="@string/rectangle200" />
		</group>
		</group>
		<group
		android:name="SecondLevelGroup2"
		android:alpha="0.8"
		android:translateX="100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FF0000FF"
		android:pathData="@string/rectangle200" />

		<group
		android:name="ThridLevelGroup3"
		android:alpha="0.9"
		android:translateX="-100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FFFF0000"
		android:pathData="@string/rectangle200" />
		</group>
		<group
		android:name="ThridLevelGroup4"
		android:alpha="0.8"
		android:translateX="100.0"
		android:translateY="50.0" >
		<path
		android:fill="#FF00FF00"
		android:pathData="@string/rectangle200" />
		</group>
		</group>

		<path
		android:fill="#FFFF0000"
		android:pathData="@string/rectangle200" />
		</group>

		</vector>
		No newline at end of file

tests/VectorDrawableTest/res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,5 +24,5 @@
		<string name="equal2"> "M300,35 l 0,-35 70,0 0,35z M300,105 l 70,0 0,35 -70,0z"</string>
		<string name="round_box">"m2.10001,-6c-1.9551,0 -0.5,0.02499 -2.10001,0.02499c-1.575,0 0.0031,-0.02499 -1.95,-0.02499c-2.543,0 -4,2.2816 -4,4.85001c0,3.52929 0.25,6.25 5.95,6.25c5.7,0 6,-2.72071 6,-6.25c0,-2.56841 -1.35699,-4.85001 -3.89999,-4.85001"</string>
		<string name="heart"> "m4.5,-7c-1.95509,0 -3.83009,1.26759 -4.5,3c-0.66991,-1.73241 -2.54691,-3 -4.5,-3c-2.543,0 -4.5,1.93159 -4.5,4.5c0,3.5293 3.793,6.2578 9,11.5c5.207,-5.2422 9,-7.9707 9,-11.5c0,-2.56841 -1.957,-4.5 -4.5,-4.5"</string>

		<string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
		</resources>
		No newline at end of file

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ public class VectorDrawablePerformance extends Activity {
		R.drawable.vector_drawable22,
		R.drawable.vector_drawable23,
		R.drawable.vector_drawable24,
		R.drawable.vector_drawable25,
		};

		@Override