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

Commit 86e43034 authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp 

Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
parents be2ed6d6 a4350fc0

tools/layoutlib/README

0 → 100644
+4 −0
Original line number Diff line number Diff line 
Layoutlib is a custom version of the android View framework designed to run inside Eclipse.

The goal of the library is to provide layout rendering in Eclipse that are very very close to their rendering on devices.



None of the com.android.* or android.* classes in layoutlib run on devices.
 
 No newline at end of file

tools/layoutlib/bridge/.classpath

+5 −4
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ 
	<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/layoutlib.jar" sourcepath="/ANDROID_SRC/frameworks/base/core/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_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/tools-common/tools-common-prebuilt.jar"/>

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

</classpath>

tools/layoutlib/bridge/Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -17,13 +17,17 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_JAVA_RESOURCE_DIRS := resources





LOCAL_JAVA_LIBRARIES := \

	kxml2-2.3.0 \

	layoutlib_api-prebuilt \

	ninepatch

	tools-common-prebuilt



LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib

LOCAL_STATIC_JAVA_LIBRARIES := \

	temp_layoutlib \

	ninepatch-prebuilt



LOCAL_MODULE := layoutlib

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

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<merge xmlns:android="http://schemas.android.com/apk/res/android">

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<TextView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"/>

</merge>

tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png

0 → 100644
+1.17 KiB
Loading image diff...