Merge branch 'eclair' into eclair-release (b32073a8) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -4324,8 +4324,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		requestLayout();
		invalidate();

		if (((mViewFlags & VISIBILITY_MASK) == GONE) && hasFocus()) {
		clearFocus();
		if (((mViewFlags & VISIBILITY_MASK) == GONE)) {
		if (hasFocus()) clearFocus();
		destroyDrawingCache();
		}
		if (mAttachInfo != null) {
		mAttachInfo.mViewVisibilityChanged = true;
		@@ -6283,6 +6284,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		canvas.translate(-mScrollX, -mScrollY);

		mPrivateFlags \|= DRAWN;
		mPrivateFlags \|= DRAWING_CACHE_VALID;

		// Fast path for layouts with no backgrounds
		if ((mPrivateFlags & SKIP_DRAW) == SKIP_DRAW) {
		@@ -6301,7 +6303,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		// Restore the cached Canvas for our siblings
		attachInfo.mCanvas = canvas;
		}
		mPrivateFlags \|= DRAWING_CACHE_VALID;
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,7 @@ void android_os_Process_setThreadPriority(JNIEnv* env, jobject clazz,

		if (rc) {
		signalExceptionForGroupError(env, clazz, errno);
		return;
		}

		if (setpriority(PRIO_PROCESS, pid, pri) < 0) {

+0 −3

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		ifeq ($(TARGET_BOARD_PLATFORM), msm7k)
		LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
		endif
		ifeq ($(TARGET_BOARD_PLATFORM), qsd8k)
		LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
		endif

		# need "-lrt" on Linux simulator to pick up clock_gettime
		ifeq ($(TARGET_SIMULATOR),true)

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,8 @@ public class ExifInterface {
		static {
		System.loadLibrary("exif");
		sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
		sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
		//TODO: uncomment this when our EXIF datetime is encoded as UTC
		//sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
		}

		private String mFilename;

+1 −1

Original line number	Diff line number	Diff line
		@@ -746,7 +746,7 @@ public class MediaScanner

		long time = exif.getDateTime();
		if (time != -1) {
		values.put(Images.Media.DATE_TAKEN, time * 1000);
		values.put(Images.Media.DATE_TAKEN, time);
		}

		int orientation = exif.getAttributeInt(