Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb (3944b784) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java

deleted100644 → 0

+0 −605

File deleted.

Preview size limit exceeded, changes collapsed.

tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java

0 → 100644

+117 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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.
		*/

		package android.graphics;

		import com.android.layoutlib.bridge.Bridge;
		import com.android.layoutlib.bridge.android.BridgeResources.NinePatchInputStream;
		import com.android.layoutlib.bridge.impl.DelegateManager;
		import com.android.ninepatch.NinePatchChunk;
		import com.android.resources.Density;

		import android.graphics.BitmapFactory.Options;

		import java.io.FileDescriptor;
		import java.io.IOException;
		import java.io.InputStream;

		/**
		* Delegate implementing the native methods of android.graphics.BitmapFactory
		*
		* Through the layoutlib_create tool, the original native methods of BitmapFactory have been
		* replaced by calls to methods of the same name in this delegate class.
		*
		* Because it's a stateless class to start with, there's no need to keep a {@link DelegateManager}
		* around to map int to instance of the delegate.
		*
		*/
		/package/ class BitmapFactory_Delegate {

		// ------ Native Delegates ------

		/package/ static void nativeSetDefaultConfig(int nativeConfig) {
		// pass
		}

		/package/ static Bitmap nativeDecodeStream(InputStream is, byte[] storage,
		Rect padding, Options opts) {
		Bitmap bm = null;

		Density density = Density.MEDIUM;
		if (opts != null) {
		density = Density.getEnum(opts.inDensity);
		}

		try {
		if (is instanceof NinePatchInputStream) {
		NinePatchInputStream npis = (NinePatchInputStream) is;
		npis.disableFakeMarkSupport();

		// load the bitmap as a nine patch
		com.android.ninepatch.NinePatch ninePatch = com.android.ninepatch.NinePatch.load(
		npis, true /is9Patch/, false /convert/);

		// get the bitmap and chunk objects.
		bm = Bitmap_Delegate.createBitmap(ninePatch.getImage(), true /isMutable/,
		density);
		NinePatchChunk chunk = ninePatch.getChunk();

		// put the chunk in the bitmap
		bm.setNinePatchChunk(NinePatch_Delegate.serialize(chunk));

		// read the padding
		int[] paddingarray = chunk.getPadding();
		padding.left = paddingarray[0];
		padding.top = paddingarray[1];
		padding.right = paddingarray[2];
		padding.bottom = paddingarray[3];
		} else {
		// load the bitmap directly.
		bm = Bitmap_Delegate.createBitmap(is, true, density);
		}
		} catch (IOException e) {
		Bridge.getLog().error(null,"Failed to load image" , e, null);
		}

		return bm;
		}

		/package/ static Bitmap nativeDecodeFileDescriptor(FileDescriptor fd,
		Rect padding, Options opts) {
		opts.inBitmap = null;
		return null;
		}

		/package/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) {
		opts.inBitmap = null;
		return null;
		}

		/package/ static Bitmap nativeDecodeByteArray(byte[] data, int offset,
		int length, Options opts) {
		opts.inBitmap = null;
		return null;
		}

		/package/ static byte[] nativeScaleNinePatch(byte[] chunk, float scale, Rect pad) {
		// don't scale for now.
		return chunk;
		}

		/package/ static boolean nativeIsSeekable(FileDescriptor fd) {
		return true;
		}
		}

tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.layoutlib.bridge.Bridge;
		import com.android.layoutlib.bridge.impl.DelegateManager;
		import com.android.resources.Density;

		import android.graphics.Bitmap;
		import android.graphics.Bitmap.Config;
		import android.os.Parcel;

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -65,9 +65,26 @@ public final class BridgeResources extends Resources {
		* to know whether this is 9-patch or not, such as BitmapFactory.
		*/
		public class NinePatchInputStream extends FileInputStream {
		private boolean mFakeMarkSupport = true;
		public NinePatchInputStream(File file) throws FileNotFoundException {
		super(file);
		}

		@Override
		public boolean markSupported() {
		if (mFakeMarkSupport) {
		// this is needed so that BitmapFactory doesn't wrap this in a BufferedInputStream.
		return true;
		}

		return super.markSupported();
		}

		public void disableFakeMarkSupport() {
		// disable fake mark support so that in case codec actually try to use them
		// we don't lie to them.
		mFakeMarkSupport = false;
		}
		}

		/**

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ public final class CreateInfo implements ICreateInfo {
		"android.animation.PropertyValuesHolder",
		"android.graphics.AvoidXfermode",
		"android.graphics.Bitmap",
		"android.graphics.BitmapFactory",
		"android.graphics.BitmapShader",
		"android.graphics.BlurMaskFilter",
		"android.graphics.Canvas",
		@@ -164,7 +165,6 @@ public final class CreateInfo implements ICreateInfo {
		*/
		private final static String[] RENAMED_CLASSES =
		new String[] {
		"android.graphics.BitmapFactory", "android.graphics._Original_BitmapFactory",
		"android.os.ServiceManager", "android.os._Original_ServiceManager",
		"android.view.SurfaceView", "android.view._Original_SurfaceView",
		"android.view.accessibility.AccessibilityManager", "android.view.accessibility._Original_AccessibilityManager",