Merge branch 'eclair' into eclair-a2sd (9ee39ba7) · Commits · e / os / android_frameworks_base

core/java/android/widget/DatePicker.java

+17 −14

Original line number	Diff line number	Diff line
		@@ -94,9 +94,7 @@ public class DatePicker extends FrameLayout {
		mDayPicker.setOnChangeListener(new OnChangedListener() {
		public void onChanged(NumberPicker picker, int oldVal, int newVal) {
		mDay = newVal;
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		}
		});
		mMonthPicker = (NumberPicker) findViewById(R.id.month);
		@@ -114,9 +112,7 @@ public class DatePicker extends FrameLayout {
		mMonth = newVal - 1;
		// Adjust max day of the month
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		updateDaySpinner();
		}
		});
		@@ -127,9 +123,7 @@ public class DatePicker extends FrameLayout {
		mYear = newVal;
		// Adjust max day for leap years if needed
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		updateDaySpinner();
		}
		});
		@@ -230,11 +224,14 @@ public class DatePicker extends FrameLayout {
		}

		public void updateDate(int year, int monthOfYear, int dayOfMonth) {
		if (mYear != year \|\| mMonth != monthOfYear \|\| mDay != dayOfMonth) {
		mYear = year;
		mMonth = monthOfYear;
		mDay = dayOfMonth;
		updateSpinners();
		reorderPickers(new DateFormatSymbols().getShortMonths());
		notifyDateChanged();
		}
		}

		private static class SavedState extends BaseSavedState {
		@@ -376,4 +373,10 @@ public class DatePicker extends FrameLayout {
		mDay = max;
		}
		}

		private void notifyDateChanged() {
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		}
		}

graphics/java/android/renderscript/Allocation.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -261,29 +261,6 @@ public class Allocation extends BaseObj {
		return new Allocation(id, rs, null);
		}

		static public Allocation createFromBitmap(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips, int index)
		throws IllegalArgumentException {

		rs.validate();
		int id = rs.nAllocationCreateFromBitmap1(index, dstFmt.mID, genMips, b);
		return new Allocation(id, rs, null);
		}

		static public void addToAllocation(RenderScript rs, int index)
		throws IllegalArgumentException {
		rs.nAllocationAddToAllocationList(index);
		}

		static public void removeFromAllocation(RenderScript rs, int index)
		throws IllegalArgumentException {
		rs.nAllocationRemoveFromAllocationList(index);
		}

		static public void createAllocationList(RenderScript rs, int count)
		throws IllegalArgumentException {
		rs.nAllocationCreateAllocationList(count);
		}

		static public Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)
		throws IllegalArgumentException {

graphics/java/android/renderscript/RenderScript.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -101,10 +101,6 @@ public class RenderScript {

		native int nAllocationCreateTyped(int type);
		native int nAllocationCreateFromBitmap(int dstFmt, boolean genMips, Bitmap bmp);
		native int nAllocationCreateFromBitmap1(int index, int dstFmt, boolean genMips, Bitmap bmp);
		native int nAllocationAddToAllocationList(int index);
		native int nAllocationRemoveFromAllocationList(int index);
		native int nAllocationCreateAllocationList(int count);
		native int nAllocationCreateFromBitmapBoxed(int dstFmt, boolean genMips, Bitmap bmp);
		native int nAllocationCreateFromAssetStream(int dstFmt, boolean genMips, int assetStream);

graphics/jni/android_renderscript_RenderScript.cpp

+0 −50

Original line number	Diff line number	Diff line
		@@ -493,52 +493,6 @@ nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jint dstFmt, jboolean g
		return 0;
		}

		static int
		nAllocationCreateFromBitmap1(JNIEnv *_env, jobject _this, jint index, jint dstFmt, jboolean genMips, jobject jbitmap)
		{
		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
		SkBitmap const * nativeBitmap =
		(SkBitmap const *)_env->GetIntField(jbitmap, gNativeBitmapID);
		const SkBitmap& bitmap(*nativeBitmap);
		SkBitmap::Config config = bitmap.getConfig();

		RsElement e = SkBitmapToPredefined(config);
		if (e) {
		bitmap.lockPixels();
		const int w = bitmap.width();
		const int h = bitmap.height();
		const void* ptr = bitmap.getPixels();
		jint id = (jint)rsAllocationCreateFromBitmap1(con, w, h, (RsElement)dstFmt, e, genMips, ptr, index);
		bitmap.unlockPixels();
		return id;
		}
		return 0;
		}

		static int
		nAllocationAddToAllocationList(JNIEnv *_env, jobject _this, jint index)
		{
		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
		rsAllocationAddToAllocationList(con, index);
		return 0;
		}

		static int
		nAllocationRemoveFromAllocationList(JNIEnv *_env, jobject _this, jint index)
		{
		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
		rsAllocationRemoveFromAllocationList(con, index);
		return 0;
		}

		static int
		nAllocationCreateAllocationList(JNIEnv *_env, jobject _this, jint index)
		{
		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
		rsAllocationCreateAllocationList(con, index);
		return 0;
		}

		static int
		nAllocationCreateFromAssetStream(JNIEnv *_env, jobject _this, jint dstFmt, jboolean genMips, jint native_asset)
		{
		@@ -1423,10 +1377,6 @@ static JNINativeMethod methods[] = {

		{"nAllocationCreateTyped", "(I)I", (void*)nAllocationCreateTyped },
		{"nAllocationCreateFromBitmap", "(IZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmap },
		{"nAllocationCreateFromBitmap1", "(IIZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmap1 },
		{"nAllocationAddToAllocationList", "(I)I", (void*)nAllocationAddToAllocationList},
		{"nAllocationRemoveFromAllocationList", "(I)I", (void*)nAllocationRemoveFromAllocationList},
		{"nAllocationCreateAllocationList", "(I)I", (void*)nAllocationCreateAllocationList},
		{"nAllocationCreateFromBitmapBoxed","(IZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmapBoxed },
		{"nAllocationCreateFromAssetStream","(IZI)I", (void*)nAllocationCreateFromAssetStream },
		{"nAllocationUploadToTexture", "(II)V", (void*)nAllocationUploadToTexture },

libs/rs/rs.spec

+0 −23

Original line number	Diff line number	Diff line
		@@ -109,29 +109,6 @@ AllocationCreateFromBitmap {
		ret RsAllocation
		}

		AllocationCreateFromBitmap1 {
		param uint32_t width
		param uint32_t height
		param RsElement dstFmt
		param RsElement srcFmt
		param bool genMips
		param const void * data
		param uint32_t index
		ret RsAllocation
		}

		AllocationAddToAllocationList {
		param uint32_t index
		}

		AllocationRemoveFromAllocationList {
		param uint32_t index
		}

		AllocationCreateAllocationList {
		param uint32_t count
		}

		AllocationCreateFromBitmapBoxed {
		param uint32_t width
		param uint32_t height