Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair (97b6b248) · Commits · e / os / android_frameworks_base

cmds/installd/commands.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -373,6 +373,7 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src)
		char *tmp;
		int srclen;
		int dstlen;
		char dexopt_data_only[PROPERTY_VALUE_MAX];

		srclen = strlen(src);

		@@ -387,8 +388,11 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src)

		const char *cache_path = DALVIK_CACHE_PREFIX;
		if (!strncmp(src, "/system", 7)) {
		property_get("dalvik.vm.dexopt-data-only", dexopt_data_only, "");
		if (strcmp(dexopt_data_only, "1") != 0) {
		cache_path = DALVIK_SYSTEM_CACHE_PREFIX;
		}
		}
		if (!strncmp(src, "/sd-ext", 7)) {
		cache_path = DALVIK_SDEXT_CACHE_PREFIX;
		}

core/java/com/google/android/mms/ContentType.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ public class ContentType {
		public static final String MMS_GENERIC = "application/vnd.wap.mms-generic";
		public static final String MULTIPART_MIXED = "application/vnd.wap.multipart.mixed";
		public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";
		public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";

		public static final String TEXT_PLAIN = "text/plain";
		public static final String TEXT_HTML = "text/html";

core/java/com/google/android/mms/pdu/PduParser.java

+36 −17

Original line number	Diff line number	Diff line
		@@ -200,7 +200,18 @@ public class PduParser {
		PduHeaders headers = new PduHeaders();

		while (keepParsing && (pduDataStream.available() > 0)) {
		pduDataStream.mark(1);
		int headerField = extractByteValue(pduDataStream);
		/* parse custom text header */
		if ((headerField >= TEXT_MIN) && (headerField <= TEXT_MAX)) {
		pduDataStream.reset();
		byte [] bVal = parseWapString(pduDataStream, TYPE_TEXT_STRING);
		if (LOCAL_LOGV) {
		Log.v(LOG_TAG, "TextHeader: " + new String(bVal));
		}
		/* we should ignore it at the moment */
		continue;
		}
		switch (headerField) {
		case PduHeaders.MESSAGE_TYPE:
		{
		@@ -778,7 +789,14 @@ public class PduParser {
		/* get part's data */
		if (dataLength > 0) {
		byte[] partData = new byte[dataLength];
		String partContentType = new String(part.getContentType());
		pduDataStream.read(partData, 0, dataLength);
		if (partContentType.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
		// parse "multipart/vnd.wap.multipart.alternative".
		PduBody childBody = parseParts(new ByteArrayInputStream(partData));
		// take the first part of children.
		part = childBody.getPart(0);
		} else {
		// Check Content-Transfer-Encoding.
		byte[] partDataEncoding = part.getContentTransferEncoding();
		if (null != partDataEncoding) {
		@@ -799,6 +817,7 @@ public class PduParser {
		}
		part.setData(partData);
		}
		}

		/* add this part to body */
		if (THE_FIRST_PART == checkPartPosition(part)) {

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

+62 −57

Original line number	Diff line number	Diff line
		@@ -47,12 +47,13 @@
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:visibility="gone"
		/>

		<RelativeLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="18dip"
		android:layout_marginTop="9dip"
		android:layout_marginRight="6dip"
		android:layout_marginLeft="6dip"
		android:background="@android:drawable/edit_text"
		@@ -82,18 +83,41 @@

		</LinearLayout>

		<!-- emergency call button -->
		<Button
		android:id="@+id/emergencyCall"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerHorizontal="true"
		android:layout_alignParentBottom="true"
		android:text="@android:string/lockscreen_emergency_call"
		android:drawablePadding="8dip"
		android:drawableLeft="@android:drawable/ic_emergency"
		/>

		<!-- spacer below keypad -->
		<View
		android:id="@+id/spacerBottom"
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_marginBottom="4dip"
		android:layout_above="@id/emergencyCall"
		android:background="@android:drawable/divider_horizontal_dark"/>

		<!-- Keypad section -->
		<LinearLayout android:id="@+id/keyPad"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_height="fill_parent"
		android:layout_above="@id/spacerBottom"
		android:layout_below="@id/topDisplayGroup"
		android:layout_marginTop="10dip"
		android:layout_marginTop="6dip"
		android:orientation="vertical"
		>

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="64dip"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_marginLeft="2dip"
		android:layout_marginRight="2dip"
		android:orientation="horizontal"
		@@ -132,7 +156,8 @@

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="64dip"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_marginLeft="2dip"
		android:layout_marginRight="2dip"
		android:orientation="horizontal"
		@@ -171,7 +196,8 @@

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="64dip"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_marginLeft="2dip"
		android:layout_marginRight="2dip"
		android:orientation="horizontal"
		@@ -210,7 +236,8 @@

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="64dip"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_marginLeft="2dip"
		android:layout_marginRight="2dip"
		android:orientation="horizontal"
		@@ -252,27 +279,5 @@
		<!-- end keypad -->
		</LinearLayout>


		<!-- emergency call button -->
		<Button
		android:id="@+id/emergencyCall"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerHorizontal="true"
		android:layout_alignParentBottom="true"
		android:drawableLeft="@android:drawable/ic_emergency"
		android:drawablePadding="8dip"
		android:text="@android:string/lockscreen_emergency_call"
		/>

		<!-- spacer below keypad -->
		<View
		android:id="@+id/spacerBottom"
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_marginBottom="6dip"
		android:layout_above="@id/emergencyCall"
		android:background="@android:drawable/divider_horizontal_dark"/>


		</RelativeLayout>

		No newline at end of file

core/res/res/layout/keyguard_screen_tab_unlock.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -138,9 +138,8 @@
		android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/screenLocked"
		android:layout_marginTop="8dip"
		android:layout_marginLeft="24dip"
		android:layout_alignParentBottom="true"
		android:layout_centerHorizontal="true"
		android:drawableLeft="@drawable/ic_emergency"
		style="@style/Widget.Button.Transparent"
		android:drawablePadding="8dip"