Merge "Renderscript samples. Merged two model related projects. Cleanup." (3e5ea4a8) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/Font.java

+108 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package android.renderscript;

		import java.io.IOException;
		import java.io.InputStream;
		import java.util.Map;
		import java.util.HashMap;

		import android.content.res.Resources;
		import android.content.res.AssetManager;
		@@ -30,10 +32,100 @@ import android.util.TypedValue;
		**/
		public class Font extends BaseObj {

		//These help us create a font by family name
		private static final String[] sSansNames = {
		"sans-serif", "arial", "helvetica", "tahoma", "verdana"
		};

		private static final String[] sSerifNames = {
		"serif", "times", "times new roman", "palatino", "georgia", "baskerville",
		"goudy", "fantasy", "cursive", "ITC Stone Serif"
		};

		private static final String[] sMonoNames = {
		"monospace", "courier", "courier new", "monaco"
		};

		private static class FontFamily {
		String[] mNames;
		String mNormalFileName;
		String mBoldFileName;
		String mItalicFileName;
		String mBoldItalicFileName;
		}

		private static Map<String, FontFamily> sFontFamilyMap;

		public enum Style {
		NORMAL,
		BOLD,
		ITALIC,
		BOLD_ITALIC;
		}

		private static void addFamilyToMap(FontFamily family) {
		for(int i = 0; i < family.mNames.length; i ++) {
		sFontFamilyMap.put(family.mNames[i], family);
		}
		}

		private static void initFontFamilyMap() {
		sFontFamilyMap = new HashMap<String, FontFamily>();

		FontFamily sansFamily = new FontFamily();
		sansFamily.mNames = sSansNames;
		sansFamily.mNormalFileName = "DroidSans.ttf";
		sansFamily.mBoldFileName = "DroidSans-Bold.ttf";
		sansFamily.mItalicFileName = "DroidSans.ttf";
		sansFamily.mBoldItalicFileName = "DroidSans-Bold.ttf";
		addFamilyToMap(sansFamily);

		FontFamily serifFamily = new FontFamily();
		serifFamily.mNames = sSerifNames;
		serifFamily.mNormalFileName = "DroidSerif-Regular.ttf";
		serifFamily.mBoldFileName = "DroidSerif-Bold.ttf";
		serifFamily.mItalicFileName = "DroidSerif-Italic.ttf";
		serifFamily.mBoldItalicFileName = "DroidSerif-BoldItalic.ttf";
		addFamilyToMap(serifFamily);

		FontFamily monoFamily = new FontFamily();
		monoFamily.mNames = sMonoNames;
		monoFamily.mNormalFileName = "DroidSansMono.ttf";
		monoFamily.mBoldFileName = "DroidSansMono.ttf";
		monoFamily.mItalicFileName = "DroidSansMono.ttf";
		monoFamily.mBoldItalicFileName = "DroidSansMono.ttf";
		addFamilyToMap(monoFamily);
		}

		static {
		initFontFamilyMap();
		}

		static String getFontFileName(String familyName, Style style) {
		FontFamily family = sFontFamilyMap.get(familyName);
		if(family != null) {
		switch(style) {
		case NORMAL:
		return family.mNormalFileName;
		case BOLD:
		return family.mBoldFileName;
		case ITALIC:
		return family.mItalicFileName;
		case BOLD_ITALIC:
		return family.mBoldItalicFileName;
		}
		}
		// Fallback if we could not find the desired family
		return "DroidSans.ttf";
		}

		Font(int id, RenderScript rs) {
		super(id, rs);
		}

		/**
		* Takes a specific file name as an argument
		*/
		static public Font create(RenderScript rs, Resources res, String fileName, int size)
		throws IllegalArgumentException {

		@@ -43,7 +135,7 @@ public class Font extends BaseObj {
		int fontId = rs.nFontCreateFromFile(fileName, size, dpi);

		if(fontId == 0) {
		throw new IllegalStateException("Load loading a font");
		throw new IllegalStateException("Failed loading a font");
		}
		Font rsFont = new Font(fontId, rs);

		@@ -55,4 +147,19 @@ public class Font extends BaseObj {

		return null;
		}

		/**
		* Accepts one of the following family names as an argument
		* and will attemp to produce the best match with a system font
		* "sans-serif" "arial" "helvetica" "tahoma" "verdana"
		* "serif" "times" "times new roman" "palatino" "georgia" "baskerville"
		* "goudy" "fantasy" "cursive" "ITC Stone Serif"
		* "monospace" "courier" "courier new" "monaco"
		* Returns default font if no match could be found
		*/
		static public Font createFromFamily(RenderScript rs, Resources res, String familyName, Style fontStyle, int size)
		throws IllegalArgumentException {
		String fileName = getFontFileName(familyName, fontStyle);
		return create(rs, res, fileName, size);
		}
		}

libs/rs/java/ModelViewer/AndroidManifest.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -10,5 +10,13 @@
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>
		<activity android:name="SceneGraph"
		android:label="SceneGraph"
		android:theme="@android:style/Theme.Black.NoTitleBar">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>
		</application>
		</manifest>

libs/rs/java/SceneGraph/src/com/android/scenegraph/SceneGraph.java→libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraph.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.scenegraph;
		package com.android.modelviewer;

		import android.renderscript.RSSurfaceView;
		import android.renderscript.RenderScript;

libs/rs/java/SceneGraph/src/com/android/scenegraph/SceneGraphRS.java→libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.scenegraph;
		package com.android.modelviewer;

		import java.io.Writer;
		import java.util.Map;

libs/rs/java/SceneGraph/src/com/android/scenegraph/SceneGraphView.java→libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.scenegraph;
		package com.android.modelviewer;

		import java.io.Writer;
		import java.util.ArrayList;