Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f917f9ac authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android (Google) Code Review
Browse files

Merge "Layoutlib: New bridge implementation using the new API 5."

parents 9232f2e5 c2e9651b

tools/layoutlib/bridge/.classpath

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
	<classpathentry kind="src" path="tests"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/layoutlib_api/layoutlib_api-prebuilt.jar"/>

	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>

	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_SRC/development/tools/ninepatch/src"/>

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/prebuilt/common/layoutlib_api/layoutlib_api-prebuilt.jar"/>

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_PLAT_SRC/dalvik/libcore/xml/src/main/java"/>

	<classpathentry kind="var" path="ANDROID_PLAT_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_PLAT_SRC/development/tools/ninepatch/src"/>

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar" sourcepath="/ANDROID_PLAT_SRC/frameworks/base"/>

	<classpathentry kind="output" path="bin"/>

</classpath>

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.graphics;



import com.android.layoutlib.api.IDensityBasedResourceValue.Density;

import com.android.layoutlib.bridge.DelegateManager;

import com.android.layoutlib.bridge.impl.DelegateManager;



import android.graphics.Bitmap.Config;

import android.os.Parcel;

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.graphics;



import com.android.layoutlib.api.ILayoutLog;

import com.android.layoutlib.bridge.DelegateManager;

import com.android.layoutlib.bridge.impl.DelegateManager;



import android.graphics.Paint_Delegate.FontInfo;

import android.text.TextUtils;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.graphics;



import com.android.layoutlib.bridge.DelegateManager;

import com.android.layoutlib.bridge.impl.DelegateManager;



/**

 * Delegate implementing the native methods of android.graphics.DashPathEffect

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.graphics;



import com.android.layoutlib.bridge.DelegateManager;

import com.android.layoutlib.bridge.impl.DelegateManager;



import android.graphics.Shader.TileMode;