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

Commit b052ecaa authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp 

Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
parents 86409c8c 86e43034

tools/layoutlib/bridge/.classpath

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 
	<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_SRC/out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar" sourcepath="/ANDROID_PLAT_SRC/frameworks/base"/>

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

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

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

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

</classpath>

tools/layoutlib/bridge/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := resources 
LOCAL_JAVA_LIBRARIES := \

	kxml2-2.3.0 \

	layoutlib_api-prebuilt \

	common-prebuilt

	tools-common-prebuilt



LOCAL_STATIC_JAVA_LIBRARIES := \

	temp_layoutlib \

tools/layoutlib/bridge/resources/bars/phone_system_bar.xml

+3 −1
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ 
			android:layout_width="wrap_content"/>

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

			android:layout_width="wrap_content"

			android:layout_marginLeft="3dip"

			android:layout_marginRight="5dip"/>

</merge>

tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.animation;



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

import com.android.tools.layoutlib.annotations.LayoutlibDelegate;



/**

 * Delegate implementing the native methods of android.animation.PropertyValuesHolder
@@ -34,20 +35,24 @@ import com.android.layoutlib.bridge.impl.DelegateManager; 
 */

/*package*/ class PropertyValuesHolder_Delegate {



    @LayoutlibDelegate

    /*package*/ static int nGetIntMethod(Class<?> targetClass, String methodName) {

        // return 0 to force PropertyValuesHolder to use Java reflection.

        return 0;

    }



    @LayoutlibDelegate

    /*package*/ static int nGetFloatMethod(Class<?> targetClass, String methodName) {

        // return 0 to force PropertyValuesHolder to use Java reflection.

        return 0;

    }



    @LayoutlibDelegate

    /*package*/ static void nCallIntMethod(Object target, int methodID, int arg) {

        // do nothing

    }



    @LayoutlibDelegate

    /*package*/ static void nCallFloatMethod(Object target, int methodID, float arg) {

        // do nothing

    }

tools/layoutlib/bridge/src/android/app/Fragment_Delegate.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app;



import com.android.ide.common.rendering.api.IProjectCallback;

import com.android.tools.layoutlib.annotations.LayoutlibDelegate;



import android.content.Context;

import android.os.Bundle;
@@ -48,6 +49,7 @@ public class Fragment_Delegate { 
     * Like {@link #instantiate(Context, String, Bundle)} but with a null

     * argument Bundle.

     */

    @LayoutlibDelegate

    /*package*/ static Fragment instantiate(Context context, String fname) {

        return instantiate(context, fname, null);

    }
@@ -66,6 +68,7 @@ public class Fragment_Delegate { 
     * the given fragment class.  This is a runtime exception; it is not

     * normally expected to happen.

     */

    @LayoutlibDelegate

    /*package*/ static Fragment instantiate(Context context, String fname, Bundle args) {

        try {

            if (sProjectCallback != null) {