Merge change 4792 into donut

* changes:
  when we reset a paint, it should return to the state it was in when it was first created. for java, this means setting its text-encoding to UTF16...

parents 9ebd737e 290f5baf

core/jni/android/graphics/Paint.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ public:

		static void reset(JNIEnv* env, jobject clazz, SkPaint* obj) {
		obj->reset();
		// utf16 is required for java
		obj->setTextEncoding(SkPaint::kUTF16_TextEncoding);
		}

		static void assign(JNIEnv* env, jobject clazz, SkPaint* dst, const SkPaint* src) {